Merge branch '8523-do-not-use-ubuntu-18-for-jobs' into 'master'

Use Ubuntu 22.04 for license and manifest upload

Closes #8523

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7577

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Ryan Egesdahl <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Robert Marshall <[email protected]>

Author: balasankarc

gitlab-ci-config/dev-gitlab-org.yml

@@ -1048,13 +1048,14 @@ QA-Tag:
 
 license-upload:
   stage: metrics
-  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
   script:
     - bundle exec rake license:upload
   tags: !reference [.distribution-amd64-tags]
   cache: !reference [.tag-cache]
   needs:
-    - Ubuntu-18.04
+    - Ubuntu-22.04
+  allow_failure: true
   rules:
     - !reference [.default_rules, rules]
     - !reference [.skip_release_jobs, rules]
@@ -1063,13 +1064,13 @@ license-upload:
 
 manifest-upload:
   stage: metrics
-  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
   script:
     - bundle exec rake manifest:upload
   tags: !reference [.distribution-amd64-tags]
   cache: !reference [.tag-cache]
   needs:
-    - Ubuntu-18.04
+    - Ubuntu-22.04
   allow_failure: true
   rules:
     - !reference [.default_rules, rules]

lib/gitlab/license/uploader.rb

@@ -54,7 +54,7 @@ def copy_license
       #
       dest_dir = File.join(@licenses_path, @edition, @current_minor_version)
       FileUtils.mkdir_p(dest_dir)
-      FileUtils.cp("pkg/ubuntu-bionic/#{@edition}_#{@current_version}.license-status.json", "#{dest_dir}/#{@current_version}.json")
+      FileUtils.cp("pkg/ubuntu-jammy/#{@edition}_#{@current_version}.license-status.json", "#{dest_dir}/#{@current_version}.json")
     end
 
     def load_data