Reverse trigger order in deploy swarm job

Required for proper node allocation throught cloud

Change-Id: Ic1960b8281578236d5f18aed734e0bb5138d1337

diff --git a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
index 0dd09fc5b0a592251887f59357960e413521b20e..a4c49846bef4213808445ddc0da983298309b1f9 100644 (file)
--- a/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
+++ b/maintenance-ci/common/jobs/deploy-jenkins-swarm.yaml
@@ -25,7 +25,7 @@
     builders:
     - conditional-step:
         condition-kind: num-comp
-        lhs: $MOS_BASE_NODE_COUNT
+        lhs: $CUSTOM_FLAVOR_NODE_COUNT
         rhs: 0
         comparator: greater-than
         steps:
@@ -35,17 +35,18 @@
               parameter-factories:
               - factory: counterbuild
                 from: 1
-                to: $MOS_BASE_NODE_COUNT
+                to: $CUSTOM_FLAVOR_NODE_COUNT
                 step: 1
               predefined-parameters: |
-                    HEAT_STACK_YAML=${HEAT_STACK_YAML}
-                    STACK_PREFIX=${STACK_PREFIX}
-                    FLAVOR_NAME=mos.fuel.base
-                    IMAGE_NAME=${IMAGE_NAME}
-                    GERRIT_REVIEW=${GERRIT_REVIEW}
+                  HEAT_STACK_YAML=${CUSTOM_HEAT_STACK_YAML}
+                  STACK_PREFIX=${STACK_PREFIX}
+                  FLAVOR_NAME=${CUSTOM_FLAVOR_NAME}
+                  JENKINS_LABELS=${CUSTOM_FLAVOR_JENKINS_LABELS}
+                  IMAGE_NAME=${IMAGE_NAME}
+                  GERRIT_REVIEW=${GERRIT_REVIEW}
     - conditional-step:
         condition-kind: num-comp
-        lhs: $MOS_HUGE_NODE_COUNT
+        lhs: $MOS_TEMPEST_NODE_COUNT
         rhs: 0
         comparator: greater-than
         steps:
@@ -53,19 +54,19 @@
             - project: "deploy-heat-stack"
               block: true
               parameter-factories:
-              - factory: counterbuild
-                from: 1
-                to: $MOS_HUGE_NODE_COUNT
-                step: 1
+                - factory: counterbuild
+                  from: 1
+                  to: $MOS_TEMPEST_NODE_COUNT
+                  step: 1
               predefined-parameters: |
                     HEAT_STACK_YAML=${HEAT_STACK_YAML}
                     STACK_PREFIX=${STACK_PREFIX}
-                    FLAVOR_NAME=mos.fuel.huge
+                    FLAVOR_NAME=mos.tempest
                     IMAGE_NAME=${IMAGE_NAME}
                     GERRIT_REVIEW=${GERRIT_REVIEW}
     - conditional-step:
         condition-kind: num-comp
-        lhs: $MOS_TEMPEST_NODE_COUNT
+        lhs: $MOS_HUGE_NODE_COUNT
         rhs: 0
         comparator: greater-than
         steps:
@@ -73,19 +74,19 @@
             - project: "deploy-heat-stack"
               block: true
               parameter-factories:
-                - factory: counterbuild
-                  from: 1
-                  to: $MOS_TEMPEST_NODE_COUNT
-                  step: 1
+              - factory: counterbuild
+                from: 1
+                to: $MOS_HUGE_NODE_COUNT
+                step: 1
               predefined-parameters: |
                     HEAT_STACK_YAML=${HEAT_STACK_YAML}
                     STACK_PREFIX=${STACK_PREFIX}
-                    FLAVOR_NAME=mos.tempest
+                    FLAVOR_NAME=mos.fuel.huge
                     IMAGE_NAME=${IMAGE_NAME}
                     GERRIT_REVIEW=${GERRIT_REVIEW}
     - conditional-step:
         condition-kind: num-comp
-        lhs: $CUSTOM_FLAVOR_NODE_COUNT
+        lhs: $MOS_BASE_NODE_COUNT
         rhs: 0
         comparator: greater-than
         steps:
@@ -95,12 +96,11 @@
               parameter-factories:
               - factory: counterbuild
                 from: 1
-                to: $CUSTOM_FLAVOR_NODE_COUNT
+                to: $MOS_BASE_NODE_COUNT
                 step: 1
               predefined-parameters: |
-                  HEAT_STACK_YAML=${CUSTOM_HEAT_STACK_YAML}
-                  STACK_PREFIX=${STACK_PREFIX}
-                  FLAVOR_NAME=${CUSTOM_FLAVOR_NAME}
-                  JENKINS_LABELS=${CUSTOM_FLAVOR_JENKINS_LABELS}
-                  IMAGE_NAME=${IMAGE_NAME}
-                  GERRIT_REVIEW=${GERRIT_REVIEW}
+                    HEAT_STACK_YAML=${HEAT_STACK_YAML}
+                    STACK_PREFIX=${STACK_PREFIX}
+                    FLAVOR_NAME=mos.fuel.base
+                    IMAGE_NAME=${IMAGE_NAME}
+                    GERRIT_REVIEW=${GERRIT_REVIEW}