X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdovetail%2Fdovetail-weekly-jobs.yml;h=700657d684420367909e71d19942243df5e01d87;hb=a19708f290905bbb831e7430a1d9a984d5fb6e79;hp=7b3ede902a25c396186c58c289e2ea84e71eeafa;hpb=f1105963ff4c410227f48845923c24291f8cb6d8;p=releng.git

diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml
index 7b3ede902..700657d68 100644
--- a/jjb/dovetail/dovetail-weekly-jobs.yml
+++ b/jjb/dovetail/dovetail-weekly-jobs.yml
@@ -10,8 +10,8 @@
         dovetail-branch: '{stream}'
         gs-pathname: ''
         docker-tag: 'latest'
-    colorado: &colorado
-        stream: colorado
+    danube: &danube
+        stream: danube
         branch: 'stable/{stream}'
         dovetail-branch: master
         gs-pathname: '/{stream}'
@@ -28,40 +28,40 @@
     pod:
 #        - baremetal:
 #            slave-label: apex-baremetal
-#            sut: apex
-#            <<: *colorado
+#            SUT: apex
+#            <<: *danube
         - baremetal:
             slave-label: compass-baremetal
-            sut: compass
-            <<: *colorado
+            SUT: compass
+            <<: *danube
 #        - baremetal:
 #            slave-label: fuel-baremetal
-#            sut: fuel
-#            <<: *master
+#            SUT: fuel
+#            <<: *danube
 #        - baremetal:
 #            slave-label: joid-baremetal
-#            sut: joid
-#            <<: *colorado
+#            SUT: joid
+#            <<: *danube
 
     testsuite:
         - 'debug'
-        - 'proposed_tests'
         - 'compliance_set'
+        - 'proposed_tests'
 
     loop:
         - 'weekly':
-            job-timeout: 60
+            job-timeout: 180
 
     jobs:
-        - 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+        - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
 
 ################################
 # job template
 ################################
 - job-template:
-    name: 'dovetail-{sut}-{pod}-{testsuite}-{loop}-{stream}'
+    name: 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -78,12 +78,13 @@
         - timeout:
             timeout: '{job-timeout}'
             abort: true
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
             project: '{project}'
             branch: '{dovetail-branch}'
-        - '{sut}-defaults'
+        - '{SUT}-defaults'
         - '{slave-label}-defaults'
         - string:
             name: DEPLOY_SCENARIO
@@ -114,9 +115,6 @@
         - 'dovetail-cleanup'
         - 'dovetail-run'
 
-    wrappers:
-        - fix-workspace-permissions
-
     publishers:
         - archive:
             artifacts: 'results/**/*'