Merge "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 22bc281..b65e6d5 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -81,27 +81,23 @@
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *danube
-#apex CI PODs
-        - apex-verify-master:
+#--------------------------------
+#    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-daily-master:
+        - lf-pod1:
             slave-label: '{pod}'
             SUT: apex
             auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-#        - apex-verify-colorado:
-#            slave-label: '{pod}'
-#            SUT: apex
-#            auto-trigger-name: 'daily-trigger-disabled'
-#            <<: *danube
-#        - apex-daily-colorado:
-#            slave-label: '{pod}'
-#            SUT: apex
-#            auto-trigger-name: 'daily-trigger-disabled'
-#            <<: *danube
+            <<: *danube
 #armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal
@@ -212,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: