Skip to content

Commit e1dfa73

Browse files
Robert Marshallbalasankarc
authored andcommitted
Use Ubuntu 22.04 for license and manifest upload
- Updates the license and manifest upload jobs to use Ubuntu 22.04 instead of Ubuntu 18.04. Ubuntu 18.04 reached end of standard support on May 31, 2023 and was deprecated in GitLab version 16.9. Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8084 Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8523 Signed-off-by: Robert Marshall <[email protected]>
1 parent 6f0f625 commit e1dfa73

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,13 +1048,14 @@ QA-Tag:
10481048

10491049
license-upload:
10501050
stage: metrics
1051-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
1051+
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
10521052
script:
10531053
- bundle exec rake license:upload
10541054
tags: !reference [.distribution-amd64-tags]
10551055
cache: !reference [.tag-cache]
10561056
needs:
1057-
- Ubuntu-18.04
1057+
- Ubuntu-22.04
1058+
allow_failure: true
10581059
rules:
10591060
- !reference [.default_rules, rules]
10601061
- !reference [.skip_release_jobs, rules]
@@ -1063,13 +1064,13 @@ license-upload:
10631064

10641065
manifest-upload:
10651066
stage: metrics
1066-
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04:${BUILDER_IMAGE_REVISION}"
1067+
image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_22.04:${BUILDER_IMAGE_REVISION}"
10671068
script:
10681069
- bundle exec rake manifest:upload
10691070
tags: !reference [.distribution-amd64-tags]
10701071
cache: !reference [.tag-cache]
10711072
needs:
1072-
- Ubuntu-18.04
1073+
- Ubuntu-22.04
10731074
allow_failure: true
10741075
rules:
10751076
- !reference [.default_rules, rules]

lib/gitlab/license/uploader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def copy_license
5454
#
5555
dest_dir = File.join(@licenses_path, @edition, @current_minor_version)
5656
FileUtils.mkdir_p(dest_dir)
57-
FileUtils.cp("pkg/ubuntu-bionic/#{@edition}_#{@current_version}.license-status.json", "#{dest_dir}/#{@current_version}.json")
57+
FileUtils.cp("pkg/ubuntu-jammy/#{@edition}_#{@current_version}.license-status.json", "#{dest_dir}/#{@current_version}.json")
5858
end
5959

6060
def load_data

0 commit comments

Comments
 (0)