Merge "Remove all refs to nitrogen in packaging"

[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 6e6075725bc66d2f70435c4a46ee9ffd77b30e3b..70cebc427a5d6a4b66231ee00a6fd57f356c762d 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:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'mdsal'
@@ -15,12 +15,6 @@
           branch: 'master'
       - 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 +22,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'