Merge "Remove centinel carbon jobs"

[releng/builder.git] / jjb / controller / controller-csit-dsbenchmark.yaml

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index f9a359f2e5e2af3057c362e1518f0df0304017e3..6edd8890945e39b1c7f7f2ab19935342a724a496 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -37,7 +34,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'