X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yml;h=0202ef0e7a0cdd0807e9a1fe46caa203b3687a79;hb=c6cf2ca62df40f902d8a51308d808474fcdaf601;hp=0154c7a71ce77fbe7cc09620ab90bce30309a5e0;hpb=b67f40692d5d353559cff6ba1636c5b0552ff06c;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 0154c7a71..0202ef0e7 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -18,6 +18,17 @@
       gs-pathname: '/{stream}'
       disabled: false
     # -------------------------------
+    # DEPLOY TYPE ANCHORS
+    # -------------------------------
+    baremetal: &baremetal
+      installer: 'fuel'
+      deploy-type: 'baremetal'
+      slave-label: 'armband-{deploy-type}'
+    virtual: &virtual
+      installer: 'fuel'
+      deploy-type: 'virtual'
+      slave-label: 'armband-{deploy-type}'
+    # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
     # CI POD's
@@ -25,25 +36,23 @@
     #        euphrates
     # -------------------------------
     pod:
+      # yamllint disable rule:key-duplicates
       - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
+          <<: *baremetal
           <<: *euphrates
       - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
+          <<: *virtual
           <<: *euphrates
       # -------------------------------
       #        master
       # -------------------------------
       - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
+          <<: *baremetal
           <<: *master
       - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
+          <<: *virtual
           <<: *master
+    # yamllint enable rule:key-duplicates
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -113,28 +122,42 @@
               DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
-      - trigger-builds:
-          - project: 'functest-{installer}-{pod}-arm-daily-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-      - trigger-builds:
-          - project: 'yardstick-{installer}-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: not
+          condition-operand:
+            condition-kind: regex-match
+            regex: 'danube'
+            label: '{stream}'
+          steps:
+            - trigger-builds:
+                - project: 'functest-{installer}-{pod}-arm-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: not
+          condition-operand:
+            condition-kind: regex-match
+            regex: 'danube'
+            label: '{stream}'
+          steps:
+            - trigger-builds:
+                - project: 'yardstick-{installer}-{pod}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       # 1.dovetail only master, based on D release
       # 2.here the stream means the SUT stream,
       #   dovetail stream is defined in its own job
@@ -143,9 +166,14 @@
       #   only to debug the dovetail tool bugs with arm pods
       # 5.only run against scenario os-(nosdn|odl)-(nofeature-bgpvpn)-ha
       - conditional-step:
-          condition-kind: regex-match
-          regex: os-(nosdn|odl)-(nofeature|bgpvpn)-ha
-          label: '{scenario}'
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: os-(nosdn|odl)-(nofeature|bgpvpn)-ha
+              label: '{scenario}'
+            - condition-kind: regex-match
+              regex: 'danube'
+              label: '{stream}'
           steps:
             - trigger-builds:
                 - project: 'dovetail-{installer}-{pod}-proposed_tests-master'
@@ -158,6 +186,25 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+      # Armband uses Fuel's log collection project job, no need to duplicate
+      - conditional-step:
+          condition-kind: not
+          condition-operand:
+            condition-kind: regex-match
+            regex: 'danube'
+            label: '{stream}'
+          steps:
+            - trigger-builds:
+                - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
 
 - job-template:
     name: '{installer}-deploy-{pod}-daily-{stream}'