From 553eaf01f7f299842d0985325e11ff8f58ef9c03 Mon Sep 17 00:00:00 2001 From: Ian Baum Date: Wed, 14 Nov 2018 11:36:02 -0600 Subject: 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 --- .gitlab-ci.yml | 1 + scripts/build_assets_image | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94922aec598..bac46a689f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" before_script: - bundle --version diff --git a/scripts/build_assets_image b/scripts/build_assets_image index 1d77524d503..4e5ef977161 100755 --- a/scripts/build_assets_image +++ b/scripts/build_assets_image @@ -1,5 +1,11 @@ #!/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 '{ -- cgit v1.2.3