Commit 9f635422 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ee-conditionally-build-assets-image' into 'master'

Add BUILD_ASSETS_IMAGE CI variable

* Defaults to FALSE
* Can be used to disable building/pushing the assets image in the
gitlab:compile:assets job

See merge request gitlab-org/gitlab-ee!8452
parents 64009fb4 7c2ea171
......@@ -32,6 +32,7 @@ variables:
GET_SOURCES_ATTEMPTS: "3"
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
BUILD_ASSETS_IMAGE: "false"
## EE specific variables ##
# This hack is needed to make ES not that memory hungry
ES_JAVA_OPTS: "-Xms256m -Xmx256m"
......
#!/bin/bash
# Exit early if we don't want to build the image
if [[ "${BUILD_ASSETS_IMAGE}" != "true" ]]
then
exit 0
fi
# Generate the image name based on the project this is being run in
ASSETS_IMAGE_NAME=$(echo ${CI_PROJECT_NAME} |
awk '{
......
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