X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-ci-jobs.yml;h=938fdf91548845cecf813405083d52a09d56e972;hb=641e4920bec46a77d8e3d3bfcd1dd4f9f9ac512f;hp=43978f6dc24cacff0617b86cceca61b50ae3586b;hpb=0c1d6689656da269d9020e55e81f215d6f5a05a2;p=releng.git

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 43978f6dc..938fdf915 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -25,7 +25,7 @@
         branch: 'stable/{stream}'
         dovetail-branch: master
         gs-pathname: '/{stream}'
-        docker-tag: 'cvp.0.2.0'
+        docker-tag: 'cvp.0.6.0'
 
 #-----------------------------------
 # POD, PLATFORM, AND BRANCH MAPPING
@@ -88,13 +88,23 @@
 # that have not been switched using labels for slaves
 #--------------------------------
 #apex PODs
-        - lf-pod1:
-            slave-label: '{pod}'
+        - virtual:
+            slave-label: apex-virtual-master
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - lf-pod1:
-            slave-label: '{pod}'
+        - baremetal:
+            slave-label: apex-baremetal-master
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *master
+        - virtual:
+            slave-label: apex-virtual-danube
+            SUT: apex
+            auto-trigger-name: 'daily-trigger-disabled'
+            <<: *danube
+        - baremetal:
+            slave-label: apex-baremetal-danube
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *danube
@@ -127,21 +137,6 @@
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - arm-pod2:
-            slave-label: '{pod}'
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - arm-pod3:
-            slave-label: '{pod}'
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - arm-virtual1:
-            slave-label: '{pod}'
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
         - zte-pod1:
             slave-label: zte-pod1
             SUT: fuel
@@ -167,9 +162,13 @@
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *danube
+        - huawei-pod4:
+            slave-label: huawei-pod4
+            SUT: apex
+            auto-trigger-name: 'apex-huawei-pod4-{testsuite}-danube-trigger'
+            <<: *danube
 #--------------------------------
     testsuite:
-        - 'debug'
         - 'compliance_set'
         - 'proposed_tests'
 
@@ -197,7 +196,7 @@
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 180
+            timeout: 300
             abort: true
         - fix-workspace-permissions
 
@@ -248,6 +247,7 @@
             artifacts: 'results/**/*'
             allow-empty: true
             fingerprint: true
+        - email-jenkins-admins-on-failure
 
 #--------------------------
 # builder macros
@@ -263,3 +263,15 @@
     builders:
         - shell:
             !include-raw: ./dovetail-cleanup.sh
+
+#--------------------------
+# trigger macros
+#--------------------------
+- trigger:
+    name: 'apex-huawei-pod4-proposed_tests-danube-trigger'
+    triggers:
+        - timed: '0 1 * * *'
+- trigger:
+    name: 'apex-huawei-pod4-compliance_set-danube-trigger'
+    triggers:
+        - timed: ''