Merge "Job for testing the ODL logs configuration"

[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..0f36f54fe2a90722147fc89ee399f8563d655062 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -6,21 +6,18 @@
 
     # The project name
     project: 'mdsal'
+    disable-job: true
 
     # The functionality under test
     functionality: 'bindingv1'
 
     stream:
-      - fluorine:
+      - neon:
           branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
-          robot-options: '-v JAVA_OPTIONS:-Xmx6656m'
 
     install:
       - only:
@@ -28,7 +25,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'