From 5b537e167de82f80355f166fee3e5519d00ace34 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Sun, 21 May 2017 21:28:57 -0400
Subject: dovetail: conditional steps added to armpod

JIRA: DOVETAIL-432

1, only run against os-(nosdn-odl_l2)-(nofeature-bgpvpn)-ha scenario
this can reduce the CI/pod time resource
dovetail test cases by now (refstack, ha, ipv6, bgpvpn)
2, this has been tested on compass pod, and works well

Change-Id: I1bcf8165d5fcc93c78b47cbd23e0c07f19b01189
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
 jjb/armband/armband-ci-jobs.yml | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

(limited to 'jjb/armband')

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index 17d520419..1531ff144 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -182,23 +182,28 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
-        # 1.dovetail only master by now, not sync with A/B/C branches
+        # 1.dovetail only master, based on D release
         # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
-        # 3.only debug testsuite here(includes 3 basic testcase,
-        #   i.e. one tempest smoke ipv6, two vping from functest)
+        # 3.only proposed_tests testsuite here(refstack, ha, ipv6, bgpvpn)
         # 4.not used for release criteria or compliance,
         #   only to debug the dovetail tool bugs with arm pods
-        - trigger-builds:
-            - project: 'dovetail-{installer}-{pod}-proposed_tests-{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'
+        # 5.only run against scenario os-(nosdn|odl_l2)-(nofeature-bgpvpn)-ha
+        - conditional-step:
+            condition-kind: regex-match
+            regex: os-(nosdn|odl_l2)-(nofeature|bgpvpn)-ha
+            label: '{scenario}'
+            steps:
+                - trigger-builds:
+                    - project: 'dovetail-{installer}-{pod}-proposed_tests-{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}'
-- 
cgit 1.2.3-korg