Merge "Remove centinel carbon jobs"

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

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 2e1f2a9433d4fd0dc81c4721ce8c1cdb0a874428..f64faeddee20f51b7bd18d8fdffad30207c20492 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -18,9 +18,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -36,7 +33,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'
 
     build-timeout: '480'