dovetail: fix wipe workspace error

[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 917856b..b65e6d5 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -20,8 +20,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}'
@@ -54,12 +54,12 @@
             slave-label: fuel-baremetal
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: fuel-virtual
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 #compass CI PODs
         - baremetal:
             slave-label: compass-baremetal
@@ -75,33 +75,29 @@
             slave-label: compass-baremetal
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - virtual:
             slave-label: compass-virtual
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
-#apex CI PODs
-        - apex-verify-master:
-            slave-label: '{pod}'
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - apex-daily-master:
+            <<: *danube
+#--------------------------------
+#    Installers not using labels
+#            CI PODs
+# This section should only contain the installers
+# that have not been switched using labels for slaves
+#--------------------------------
+#apex PODs
+        - lf-pod1:
             slave-label: '{pod}'
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
-        - apex-verify-colorado:
+        - lf-pod1:
             slave-label: '{pod}'
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
-        - apex-daily-colorado:
-            slave-label: '{pod}'
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 #armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -117,17 +113,17 @@
             slave-label: armband-baremetal
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
         - armband-virtual:
             slave-label: armband-virtual
             SUT: fuel
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *colorado
+            <<: *danube
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
@@ -180,8 +176,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
+            branch: '{dovetail-branch}'
         - '{SUT}-defaults'
         - '{slave-label}-defaults'
         - string:
@@ -213,15 +208,18 @@
         - 'dovetail-cleanup'
         - 'dovetail-run'
 
+    wrappers:
+        - fix-workspace-permissions
+
     publishers:
         - archive:
             artifacts: 'results/**/*'
             allow-empty: true
             fingerprint: true
 
-########################
+#--------------------------
 # builder macros
-########################
+#--------------------------
 - builder:
     name: dovetail-run
     builders: