Create Neon jobs and bump fluorine branch

[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 f2987c5f8ba24a0adee2905dd42cd13ad6d2efe4..b29c3ce7df0a8bb0d644ad421819aeab6b277ce9 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'mdsal'
@@ -10,26 +10,13 @@
     # The functionality under test
     functionality: 'bindingv1'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - nitrogen:
+      - neon:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_7_OPTIONS:-Xmx6144m@-XX:MaxPermSize=512m --escape space:@'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
       - only:
@@ -37,7 +24,7 @@
 
     # 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: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'