From 377d9694f8db91a92f26ed49a2b3ac2e68911674 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Thu, 19 Mar 2020 14:33:00 +0400 Subject: [PATCH] Fix errors from previous patch Change-Id: Ic714c6eb132302bcee24636fb2b495db36c1a389 --- maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml | 4 ++++ maintenance-ci/common/jobs/multijob-build-image.yaml | 3 +++ maintenance-ci/common/macroses/cloud-selector-macro-set.yaml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml index 1b2e6b7..dedcf05 100644 --- a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml +++ b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml @@ -39,6 +39,7 @@ step: 1 predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} STACK_PREFIX=${STACK_PREFIX} USE_ANTIAFFINITY_GROUP=true @@ -62,6 +63,7 @@ step: 1 predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} STACK_PREFIX=${STACK_PREFIX} USE_ANTIAFFINITY_GROUP=true @@ -85,6 +87,7 @@ step: 1 predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} STACK_PREFIX=${STACK_PREFIX} FLAVOR_NAME=mos.fuel.huge @@ -107,6 +110,7 @@ step: 1 predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} HEAT_STACK_TEMPLATE_NAME=${HEAT_STACK_TEMPLATE_NAME} STACK_PREFIX=${STACK_PREFIX} FLAVOR_NAME=mos.fuel.base diff --git a/maintenance-ci/common/jobs/multijob-build-image.yaml b/maintenance-ci/common/jobs/multijob-build-image.yaml index 51a503e..df83897 100644 --- a/maintenance-ci/common/jobs/multijob-build-image.yaml +++ b/maintenance-ci/common/jobs/multijob-build-image.yaml @@ -36,6 +36,7 @@ - project: "deploy-heat-stack" predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} HEAT_STACK_TEMPLATE_NAME=jenkins-slave STACK_PREFIX=image-builder FLAVOR_NAME=dev.cmn @@ -48,6 +49,7 @@ block: true predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} IMAGE_NAME=${BUILD_IMAGE_NAME} GERRIT_REVIEW=${GERRIT_REVIEW} STAGING_IMAGE=${STAGING_IMAGE} @@ -57,6 +59,7 @@ - project: "delete-heat-stack" predefined-parameters: | OPENSTACK_LOCATION=${OPENSTACK_LOCATION} + OPENSTACK_TENANT=${OPENSTACK_TENANT} STACK_PREFIX=image-builder block: true diff --git a/maintenance-ci/common/macroses/cloud-selector-macro-set.yaml b/maintenance-ci/common/macroses/cloud-selector-macro-set.yaml index 5ad5501..606ed91 100644 --- a/maintenance-ci/common/macroses/cloud-selector-macro-set.yaml +++ b/maintenance-ci/common/macroses/cloud-selector-macro-set.yaml @@ -67,7 +67,7 @@ properties-file: ${OPENRC_SRE_TENANT_FILE} - conditional-step: condition-kind: strings-match - condition-string1: $OPENSTACK_LOCATION + condition-string1: $OPENSTACK_TENANT condition-string2: maintenance-team condition-case-insensitive: true steps: -- 2.45.2