X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbottlenecks%2Fbottlenecks-ci-jobs.yml;h=072117ae3d93d98e5fd9a844fcf5b6fa3f699832;hb=3a76d9e0aff0902c67cc6c22bed79f4a0a02211f;hp=a8654d0cf8ed742780b6f8d482bc73bc55bcbfae;hpb=4ef7b78012e3665299cb933448f208783adf6031;p=releng.git

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index a8654d0cf..072117ae3 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
@@ -73,6 +73,12 @@
     suite:
       - 'posca_stress_traffic'
       - 'posca_stress_ping'
+      - 'posca_factor_multistack_storage'
+      - 'posca_factor_multistack_storage_parallel'
+      - 'posca_feature_moon_resources'
+      - 'posca_feature_moon_tenants'
+      - 'posca_feature_vnf_scale_out'
+      - 'posca_factor_soak_throughputs'
 
     jobs:
       - 'bottlenecks-{installer}-{suite}-{pod}-daily-{stream}'
@@ -89,6 +95,7 @@
       - timeout:
           timeout: 180
           abort: true
+      - fix-workspace-permissions
 
     triggers:
       - '{auto-trigger-name}'
@@ -126,6 +133,7 @@
     builders:
       - 'bottlenecks-env-cleanup'
       - 'bottlenecks-run-suite'
+      - 'bottlenecks-workspace-cleanup'
 
     publishers:
       - email:
@@ -147,6 +155,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
 ####################