Merge "Remove euphrates jobs"

[releng.git] / jjb / bottlenecks / bottlenecks-project-jobs.yml

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yml b/jjb/bottlenecks/bottlenecks-project-jobs.yml
index c7c9b42..d4930d7 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yml
@@ -21,15 +21,13 @@
           # This is used for different test suite dependent packages storage
           gs-packagepath: '/{suite}'
           disabled: false
-      - danube:
+      - fraser: &fraser
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           gs-packagepath: '/{stream}/{suite}'
           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
@@ -155,7 +153,8 @@
       - string:
           name: PACKAGE_URL
           default: http://205.177.226.237:9999/bottlenecks{gs-packagepath}/
-          description: "the url where we store the packages used for bottlenecks rubbos"
+          description: "the url where we store the packages used for bottlenecks\
+            \ rubbos"
 
 ####################################
 # builders for bottlenecks project
@@ -182,7 +181,7 @@
           done
 
 - builder:
-    name: bottlenecks-workspace-cleanup
+    name: bottlenecks-artifact-workspace-cleanup
     builders:
       - shell: |
           #!/bin/bash