Merge "Remove centinel carbon jobs"

[releng/builder.git] / jjb / mdsal / mdsal-csit-bindingv1.yaml

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b0b9524470ad70a95d51e541aafecce8318f5f5c..8fd766fd6aedfe1306810a01caa89552e8fd551c 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -17,10 +17,6 @@
           branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
     install:
       - only:
@@ -28,7 +24,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'