Update Orchestration scripts to work with Vex

[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 6c6769295af854f5b307f81225053cc5f22f4e05..b9e5895d22a53b1c854d5f4990f6ae0fd73c4cbe 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -10,29 +10,23 @@
     # The functionality under test
     functionality: 'bindingv1'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
           robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
-
     install:
       - only:
           scope: 'only'
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: 8 GB General Purpose v1
+    odl_system_flavor: v1-performance-2
 
     # Features to install
     install-features: 'odl-restconf'