From 5f96ebc4856e0dcc10ff4cc08cf9d4fc41c53631 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Mon, 18 Mar 2019 11:05:37 +0000 Subject: [PATCH 1/2] Merge branch 'rename-asset-image' into 'master' Set asset image name properly for all possible CE/EE project names See merge request gitlab-org/gitlab-ce!26217 --- scripts/build_assets_image | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 9afada244c8..ad5342fe3a1 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -7,14 +7,11 @@ then fi # Generate the image name based on the project this is being run in -ASSETS_IMAGE_NAME=$(echo ${CI_PROJECT_NAME} | - awk '{ - split($1, p, "-"); - interim = sprintf("%s-assets-%s", p[1], p[2]); - sub(/-$/, "", interim); - print interim - }' -) +ASSETS_IMAGE_NAME="gitlab-assets-ce" +if [[ "${CI_PROJECT_NAME}" == "gitlab-ee" ]] +then + ASSETS_IMAGE_NAME="gitlab-assets-ee" +fi ASSETS_IMAGE_PATH=${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME} -- GitLab From 1492204c03eac6e3db055453e2f25f8d62e9be2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 12 Mar 2019 12:40:05 +0000 Subject: [PATCH 2/2] Merge branch 'tag-pipeline-asset-image' into 'master' Tag asset docker image with GitLab version also See merge request gitlab-org/gitlab-ce!26029 --- scripts/build_assets_image | 6 ++++++ scripts/trigger-build | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/build_assets_image b/scripts/build_assets_image index ad5342fe3a1..25b6060b6c4 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -24,3 +24,9 @@ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY} docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_SHA} +# Also tag the image with GitLab version, if running on a tag pipeline, so +# other projects can simply use that instead of computing the slug. +if [ -n "$CI_COMMIT_TAG" ]; then + docker tag ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_SLUG} ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} + docker push ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} +fi diff --git a/scripts/trigger-build b/scripts/trigger-build index 9dbafffddfc..9c5fc3c76a5 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -141,7 +141,7 @@ module Trigger "GITLAB_#{edition}_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_VERSION" => ENV['CI_COMMIT_REF_NAME'], "GITLAB_TAG" => ENV['CI_COMMIT_TAG'], - "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_REF_SLUG'], + "GITLAB_ASSETS_TAG" => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'], "#{edition}_PIPELINE" => 'true' } end -- GitLab