X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=cb43ff14949e16591946b56b1a0b3c568063665d;hb=a67d7d6a9d3c3435793dd31b9a8d40dd861ca715;hp=a8654d0cf8ed742780b6f8d482bc73bc55bcbfae;hpb=a66aea98afa71751ed6b43673ec292a3a5070014;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index a8654d0cf..cb43ff149 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -19,8 +19,8 @@
       gs-packagepath: '/{suite}'
       # docker tag used for version control
       docker-tag: 'latest'
-    danube: &danube
-      stream: danube
+    euphrates: &euphrates
+      stream: euphrates
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       gs-packagepath: '/{stream}/{suite}'
@@ -49,12 +49,12 @@
           slave-label: compass-baremetal-branch
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *danube
+          <<: *euphrates
       - virtual:
           slave-label: compass-virtual-branch
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *danube
+          <<: *euphrates
 
     # -------------------------------
     #        None-CI PODs
@@ -63,7 +63,7 @@
     #     slave-label: '{pod}'
     #     installer: joid
     #     auto-trigger-name: 'daily-trigger-disabled'
-    #     <<: *danube
+    #     <<: *euphrates
     # - orange-pod2:
     #     slave-label: '{pod}'
     #     installer: joid
@@ -89,6 +89,7 @@
       - timeout:
           timeout: 180
           abort: true
+      - fix-workspace-permissions
 
     triggers:
       - '{auto-trigger-name}'
@@ -126,6 +127,7 @@
     builders:
       - 'bottlenecks-env-cleanup'
       - 'bottlenecks-run-suite'
+      - 'bottlenecks-workspace-cleanup'
 
     publishers:
       - email:
@@ -147,6 +149,18 @@
       - shell:
           !include-raw: ./bottlenecks-run-suite.sh
 
+- builder:
+    name: bottlenecks-workspace-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+
+            # delete everything that is in $WORKSPACE
+            sudo rm -rf $WORKSPACE
+
 ####################
 # parameter macros
 ####################