From 40b5c107d7edad79f34b67bf455fd37b3029750d Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Mon, 25 Feb 2019 13:35:05 +0400 Subject: [PATCH] Switch UPDATE_SCRIPT to choise paremeter Change-Id: Ic7e1cd55768dd013bded73654aec0e31a49d2ef5 --- maintenance-ci/common/jobs/build-swarm-image.yaml | 9 +++++++-- .../common/scripts/prepare_build_upload_image.sh | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/maintenance-ci/common/jobs/build-swarm-image.yaml b/maintenance-ci/common/jobs/build-swarm-image.yaml index e4c987d..1ad6371 100644 --- a/maintenance-ci/common/jobs/build-swarm-image.yaml +++ b/maintenance-ci/common/jobs/build-swarm-image.yaml @@ -10,12 +10,17 @@ - string: name: IMAGE_NAME description: "Name of image - used for glance" - default: "swarm-slave" + default: "maintenance-ci-base-image" - bool: name: TEST_AFTER_BUILD default: "false" - - string: + - choice: name: UPDATE_SCRIPT + choices: + - "maintenance-ci/common/scripts/build_base_swarm_slave_image.sh" + - "maintenance-ci/common/scripts/build_mos_swarm_slave_image.sh" + - string: + name: CUSTOM_UPDATE_SCRIPT default: "maintenance-ci/common/scripts/build_base_swarm_slave_image.sh" - string: name: GERRIT_REVIEW diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh index d46af68..ed055e4 100755 --- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh +++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh @@ -10,6 +10,9 @@ git fetch https://review.fuel-infra.org/tools/sustaining "${refspec}" && git che fi popd +if [[ ! -z ${CUSTOM_UPDATE_SCRIPT} ]] ; then + UPDATE_SCRIPT=${CUSTOM_UPDATE_SCRIPT} +fi echo "${UPDATE_SCRIPT?} will be used for image building" if [[ ! -f /tmp/xenial-server-cloudimg-amd64-disk1.img ]] ; then -- 2.45.2