From 3956bc47f22423c463276abae62a30e99c0fbae7 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Wed, 20 Mar 2019 16:49:51 +0400 Subject: [PATCH] Rename staging stack parameter Change-Id: I3597a7496a9548b60a1e6eac2a67253daa2a5561 --- maintenance-ci/common/jobs/build-swarm-image.yaml | 2 +- maintenance-ci/common/jobs/deploy-stack.yaml | 6 ++++++ maintenance-ci/common/jobs/multijob-build-image.yaml | 4 ++-- maintenance-ci/common/scripts/prepare_build_upload_image.sh | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/maintenance-ci/common/jobs/build-swarm-image.yaml b/maintenance-ci/common/jobs/build-swarm-image.yaml index 5a0e8b3..d5c7a92 100644 --- 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 37a3710..8f56d1c 100644 --- 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 05afaa6..819875a 100644 --- 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 f886885..0df3662 100755 --- 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}" -- 2.45.2