Compare commits

...

3 Commits

Author SHA1 Message Date
Robert Marshall 6618dd0a64 Merge branch '8084-stop-ubuntu-18-04-activity' into '8523-do-not-use-ubuntu-18-for-jobs'
Stop all Ubuntu 18.04 pipeline activity

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-06 14:41:33 +00:00
Robert Marshall 315d323ed4 Make sure the uploader uses the Ubuntu 22.04 path
- The license uploader needs to look for the Ubuntu 22.04 package in the
  jammy directory, not the bionic directory.

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-06 06:02:49 -04:00
Robert Marshall 7770a9bd76 Allow license upload job to fail for now
- With no way to test the new Ubuntu 22.04 image for license upload, it
  will be allowed to fail until proven correct.

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-06 06:01:29 -04:00
2 changed files with 2 additions and 1 deletions

View File

@ -1007,6 +1007,7 @@ license-upload:
cache: !reference [.tag-cache]
needs:
- Ubuntu-22.04
allow_failure: true
rules:
- !reference [.default_rules, rules]
- !reference [.skip_release_jobs, rules]

View File

@ -54,7 +54,7 @@ module 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