summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBalasankar "Balu" C <balasankar@gitlab.com>2019-03-15 16:11:43 +0530
committerBalasankar "Balu" C <balasankar@gitlab.com>2019-03-15 17:00:57 +0530
commitde2106998a25b3911ef42196a5dfc0e25294ecc9 (patch)
treea86b004f82fe538b9b636422a660a3301c8b1eb6
parent7fa987436bab5fe9a9c3581efa74b23f41bf53c8 (diff)
downloadgitlab-ce-de2106998a25b3911ef42196a5dfc0e25294ecc9.tar.gz
Set asset image name properly for all possible CE/EE project names
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
-rwxr-xr-xscripts/build_assets_image15
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/build_assets_image b/scripts/build_assets_image
index b659bd751b2..0388cfa0c29 100755
--- a/scripts/build_assets_image
+++ b/scripts/build_assets_image
@@ -7,14 +7,13 @@ 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
- }'
-)
+if [[ "${CI_PROJECT_NAME}" == "gitlab-ce" ]] || [[ "${CI_PROJECT_NAME}" == "gitlabhq" ]]
+then
+ ASSETS_IMAGE_NAME="gitlab-assets-ce"
+elif [[ "${CI_PROJECT_NAME}" == "gitlab-ee" ]]
+then
+ ASSETS_IMAGE_NAME="gitlab-assets-ee"
+fi
ASSETS_IMAGE_PATH=${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME}