X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fcompass4nfv%2Fcompass-ci-jobs.yml;h=d806195b0f22ae212752cb8b4299e1282ae4a9dc;hb=b2ffb847c29bfdf7ae6bacb19da7419d076b6b8a;hp=16c6695c2eb9404c95c5ec36f3f8da2d3c0caf55;hpb=9736d720913dfbd96492bfb2e15e2c7f7bcd0947;p=releng.git

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 16c6695c2..d806195b0 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -39,10 +39,6 @@
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-pod2:
-            slave-label: '{pod}'
-            os-version: 'trusty'
-            <<: *colorado
         - huawei-pod5:
             slave-label: '{pod}'
             os-version: 'centos7'
@@ -103,7 +99,8 @@
             use-build-blocker: true
             blocking-jobs:
                 - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-baremetal-daily-.*?'
+                - 'compass-verify-[^-]*-[^-]*'
             block-level: 'NODE'
 
     wrappers:
@@ -159,6 +156,19 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 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
+        - trigger-builds:
+            - project: 'dovetail-compass-{pod}-basic-{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: 'compass-deploy-{pod}-daily-{stream}'
@@ -237,6 +247,7 @@
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
+                - 'newton'
                 - 'mitaka'
                 - 'liberty'
         - choice:
@@ -281,39 +292,6 @@
     triggers:
         - timed: ''
 
-- trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 19 * * *'
-- trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 23 * * *'
-- trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 15 * * *'
-- trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 11 * * *'
-- trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-onos-sfc-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: '0 7 * * *'
-- trigger:
-    name: 'compass-os-odl_l2-moon-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: ''
-- trigger:
-    name: 'compass-os-nosdn-kvm-ha-huawei-pod2-colorado-trigger'
-    triggers:
-        - timed: ''
-
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers: