Fix errors from previous patch

Change-Id: Ic714c6eb132302bcee24636fb2b495db36c1a389

diff --git a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
index 1b2e6b7c17fd2f6ef3935badffd162202a8d151e..dedcf05140c376f2514f1b8553a3d8f2ea4120e0 100644 (file)
--- 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 51a503e3784f9845c7dd16b217a08ab9e6d241cd..df838975bdb2288796eacb0794fcf66ee2a57d80 100644 (file)
--- 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 5ad55011c4b3de38eadff774962d65451ee606d3..606ed91f1801ddba2d6a2d3fecf53d54be73d95b 100644 (file)
--- 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: