Commit d37e1ba8 authored by DJ Mountney's avatar DJ Mountney
Browse files

Merge branch...

Merge branch '2736-cng-ci-ubi-release-for-certification-job-is-not-pulling-ubi-images' into 'master'

Adding -ubi8 to version to find UBI images

Closes gitlab-org/charts/gitlab#2736

See merge request gitlab-org/build/CNG!678
parents d4961294 f77c9c39
Pipeline #5661 failed with stages
in 42 seconds
...@@ -61,10 +61,10 @@ if ARGV.length < 1 ...@@ -61,10 +61,10 @@ if ARGV.length < 1
exit 1 exit 1
end end
# Add `-ubi8` to the commit ref if triggered with UBI_PIPELINE=true # Remove CE/EE suffix and add `-ubi8` to the commit ref if not already present.
version = ARGV[0] version = ARGV[0].sub(/-(ce|ee)$/, '')
if ENV['UBI_PIPELINE'] == 'true' if not version.ends_with? '-ubi8'
# we add `-ubi8` because this is probably from pipeline with UBI_PIPELINE set # we add `-ubi8` to find the UBI images.
version += '-ubi8' version += '-ubi8'
end end
...@@ -87,7 +87,7 @@ $IMAGE_VERSION_VAR.keys.each do |name| ...@@ -87,7 +87,7 @@ $IMAGE_VERSION_VAR.keys.each do |name|
# it is assumed that the "version" (commit ref) from CLI param # it is assumed that the "version" (commit ref) from CLI param
# is correct. # is correct.
if (ENV['CI_COMMIT_REF_NAME'] == 'master' || is_regular_tag) if (ENV['CI_COMMIT_REF_NAME'] == 'master' || is_regular_tag)
version = ENV[$IMAGE_VERSION_VAR[name]] version = ENV[$IMAGE_VERSION_VAR[name]].sub(/-(ce|ee)$/, '') + '-ubi8'
end end
if secrets.has_key? name if secrets.has_key? name
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment