Merge "Add Euphrates pages for reporting"

[releng.git] / jjb / dovetail / dovetail-ci-jobs.yml

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index c13c938..4c3d72f 100644 (file)
--- 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.5.0'
+        docker-tag: 'cvp.0.6.0'
 
 #-----------------------------------
 # POD, PLATFORM, AND BRANCH MAPPING
@@ -165,7 +165,7 @@
         - huawei-pod4:
             slave-label: huawei-pod4
             SUT: apex
-            auto-trigger-name: 'apex-huawei-pod4-danube-trigger'
+            auto-trigger-name: 'daily-trigger-disabled'
             <<: *danube
 #--------------------------------
     testsuite:
@@ -196,7 +196,7 @@
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
         - timeout:
-            timeout: 240
+            timeout: 300
             abort: true
         - fix-workspace-permissions
 
@@ -263,11 +263,3 @@
     builders:
         - shell:
             !include-raw: ./dovetail-cleanup.sh
-
-#--------------------------
-# trigger macros
-#--------------------------
-- trigger:
-    name: 'apex-huawei-pod4-danube-trigger'
-    triggers:
-        - timed: '* 1 * * *'