Abort the scenario periodic job in case of phase failure

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-scenario.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index 5bb871d0875bc607c8e20121d020c5ec14e4ee04..354b54db5ae929054ab6d2f3ea60eea78bfc3bb2 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -70,6 +70,8 @@
           installer-type: kubespray
       - k8-weave-nofeature:
           installer-type: kubespray
+      - k8-multus-nofeature:
+          installer-type: kubespray
 
     type:
       - baremetal:
@@ -187,7 +189,7 @@
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-deploy-{type}-{stream}'
+            - name: '{deploy-scenario}-periodic-{os}-deploy-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -205,9 +207,9 @@
               abort-all-job: true
       - multijob:
           name: functest
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-functest-{type}-{stream}'
+            - name: '{deploy-scenario}-periodic-{os}-functest-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -222,9 +224,9 @@
               abort-all-job: true
       - multijob:
           name: yardstick
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-yardstick-{type}-{stream}'
+            - name: '{deploy-scenario}-periodic-{os}-yardstick-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
@@ -239,9 +241,9 @@
               abort-all-job: true
       - multijob:
           name: promote
-          condition: ALWAYS
+          condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{os}-promote-{type}-{stream}'
+            - name: '{deploy-scenario}-periodic-{os}-promote-{type}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION