Rename staging stack parameter

Change-Id: I3597a7496a9548b60a1e6eac2a67253daa2a5561

diff --git a/maintenance-ci/common/jobs/build-swarm-image.yaml b/maintenance-ci/common/jobs/build-swarm-image.yaml
index 5a0e8b3bd7ee0b4e163fefbd77a1c1dd32d4d350..d5c7a92aa0330f1e3437a8bb39c6eda463b75e4e 100644 (file)
--- a/maintenance-ci/common/jobs/build-swarm-image.yaml
+++ b/maintenance-ci/common/jobs/build-swarm-image.yaml
@@ -11,7 +11,7 @@
         description: "Name of image - used for glance"
         default: "maintenance-ci-base-image"
     - bool:
-        name: TEST_AFTER_BUILD
+        name: STAGING_IMAGE
         default: "false"
     - choice:
         name: UPDATE_SCRIPT

diff --git a/maintenance-ci/common/jobs/deploy-stack.yaml b/maintenance-ci/common/jobs/deploy-stack.yaml
index 37a371092a866ac9e4c06bd1e3e1103d78a0e7b9..8f56d1c3d1a7db8a829206d7dcce6160282f4d9f 100644 (file)
--- a/maintenance-ci/common/jobs/deploy-stack.yaml
+++ b/maintenance-ci/common/jobs/deploy-stack.yaml
@@ -7,6 +7,12 @@
     node: 'jenkins-master'
 
     parameters:
+    - choice:
+        name: HEAT_STACK_YAML
+        choices:
+            - "maintenance-ci/common/data/jenkins-slave.yml"
+            - "maintenance-ci/common/data/mos-slave.yml"
+            - "maintenance-ci/common/data/mos-dev-slave.yml"
     - string:
         name: HEAT_STACK_YAML
         description: "Stack yaml file"

diff --git a/maintenance-ci/common/jobs/multijob-build-image.yaml b/maintenance-ci/common/jobs/multijob-build-image.yaml
index 05afaa60e2bfb28a8143324452db4d8631947549..819875ab309d84d21356c47a7feef5ff2880dabc 100644 (file)
--- a/maintenance-ci/common/jobs/multijob-build-image.yaml
+++ b/maintenance-ci/common/jobs/multijob-build-image.yaml
@@ -15,7 +15,7 @@
         description: "Name of image used for stack boot"
         default: "maintenance-ci-base-image"
     - bool:
-        name: TEST_AFTER_BUILD
+        name: STAGING_IMAGE
         default: "false"
     - choice:
         name: UPDATE_SCRIPT
@@ -47,7 +47,7 @@
           predefined-parameters: |
             IMAGE_NAME=${BUILD_IMAGE_NAME}
             GERRIT_REVIEW=${GERRIT_REVIEW}
-            TEST_AFTER_BUILD=${TEST_AFTER_BUILD}
+            STAGING_IMAGE=${STAGING_IMAGE}
             UPDATE_SCRIPT=${UPDATE_SCRIPT}
             CUSTOM_UPDATE_SCRIPT=${CUSTOM_UPDATE_SCRIPT}
     - trigger-builds:

diff --git a/maintenance-ci/common/scripts/prepare_build_upload_image.sh b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
index f886885d9247b709ee341e05406d238620ee6ec5..0df3662b78f714ea08e033f16dd51470605b6d70 100755 (executable)
--- a/maintenance-ci/common/scripts/prepare_build_upload_image.sh
+++ b/maintenance-ci/common/scripts/prepare_build_upload_image.sh
@@ -62,7 +62,7 @@ sudo umount -l /mnt/image
 sudo qemu-nbd -d /dev/nbd0
 sudo rm -rf /mnt/image
 
-if [[ "${TEST_AFTER_BUILD}" == "true" ]] ; then
+if [[ "${STAGING_IMAGE}" == "true" ]] ; then
   GLANCE_IMAGE_NAME="${IMAGE_NAME}-staging"
 else
   GLANCE_IMAGE_NAME="${IMAGE_NAME}"