X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=9f333aae0e0664d5ed3fc47a88dc1b250c028101;hb=d2aa405a69517024d46c4ce8a06925a6a773d369;hp=5c5feee803e56f3d3e40019924dbbdcfb5e564d2;hpb=77d1837c8b04c3b6edecf34d0e1bd333f2de10cb;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 5c5feee80..9f333aae0 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -54,7 +54,7 @@
       #        master
       # -------------------------------
       - baremetal-centos:
-          slave-label: 'intel-pod8'
+          slave-label: 'intel-pod17'
           os-version: 'centos7'
           <<: *master
       # -------------------------------
@@ -210,24 +210,21 @@
               unstable-threshold: 'FAILURE'
       # dovetail only master by now, not sync with A/B/C branches
       # here the stream means the SUT stream, dovetail stream is defined in its own job
-      # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
-      # run against SUT master branch, dovetail docker image with latest tag
-      # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
-      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
+      # only run on os-(nosdn|odl_l2|odl_l3)-nofeature-ha scenario
+      # run against SUT master/euphrates branch, dovetail docker image with latest tag(Monday, Tuesday)
+      # run against SUT master/euphrates branch, dovetail docker image with cvp.X.X.X tag(Thursday, Friday)
+      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag on huawei-pod7
       - conditional-step:
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: danube
-              label: '{stream}'
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              regex: os-(nosdn|odl_l3)-nofeature-ha
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
               days:
                 MON: true
-                SUN: true
+                TUES: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -246,19 +243,13 @@
           condition-kind: and
           condition-operands:
             - condition-kind: regex-match
-              regex: danube
-              label: '{stream}'
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              regex: os-(nosdn|odl_l3)-nofeature-ha
               label: '{scenario}'
             - condition-kind: day-of-week
               day-selector: select-days
               days:
-                TUES: true
-                WED: true
                 THURS: true
                 FRI: true
-                SAT: true
               use-build-time: true
           steps:
             - trigger-builds:
@@ -272,27 +263,6 @@
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: master
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-compass-{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'
       - conditional-step:
           condition-kind: and
           condition-operands: