]> review.fuel-infra Code Review - tools/sustaining.git/commitdiff
Switch UPDATE_SCRIPT to choise paremeter 04/40604/2
authorVladimir Khlyunev <vkhlyunev@mirantis.com>
Mon, 25 Feb 2019 09:35:05 +0000 (13:35 +0400)
committerVladimir Khlyunev <vkhlyunev@mirantis.com>
Mon, 25 Feb 2019 10:45:04 +0000 (14:45 +0400)
Change-Id: Ic7e1cd55768dd013bded73654aec0e31a49d2ef5

maintenance-ci/common/jobs/build-swarm-image.yaml
maintenance-ci/common/scripts/prepare_build_upload_image.sh

index e4c987dcc0224e505b1277f0a2526a505bdc1e32..1ad6371c11c18aeff7586dfc3d72b70df27c4ead 100644 (file)
     - 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
index d46af6872c744e37b920ba384092644c968a8b36..ed055e48c7752f1cb3114be1d5839a477c2e57b7 100755 (executable)
@@ -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