Bug-fix: Cleanup Workspace after Testing

JIRA: BOTTLENECK-196

RT

Change-Id: If98c2cf3636f5f65006f7418851e8d2a63a712fa
Signed-off-by: Yang Yu <Gabriel.yuyang@huawei.com>

diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index a8654d0..e7878f8 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -126,6 +126,7 @@
     builders:
       - 'bottlenecks-env-cleanup'
       - 'bottlenecks-run-suite'
+      - 'bottlenecks-workspace-cleanup'
 
     publishers:
       - email:
@@ -147,6 +148,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
+            /bin/rm -rf $WORKSPACE
+
 ####################
 # parameter macros
 ####################

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index c7c9b42..10f73b8 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -28,8 +28,6 @@
           disabled: false
 
     suite:
-      - 'rubbos'
-      - 'vstf'
       - 'posca_stress_traffic'
       - 'posca_stress_ping'
 
@@ -136,7 +134,7 @@
 
     builders:
       - 'bottlenecks-builder-upload-artifact'
-      - 'bottlenecks-workspace-cleanup'
+      - 'bottlenecks-artifact-workspace-cleanup'
 
 ####################
 # parameter macros
@@ -182,7 +180,7 @@
           done
 
 - builder:
-    name: bottlenecks-workspace-cleanup
+    name: bottlenecks-artifact-workspace-cleanup
     builders:
       - shell: |
           #!/bin/bash