Merge "Update multipatch script"

[releng/builder.git] / jjb / groupbasedpolicy / groupbasedpolicy-csit-3node.yaml

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
index 4467a8f6d0aa0032e4991439cf4c3b60ffcc1f0a..95bd59403ab77accab5c872ee004871e1a55ed07 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -12,12 +12,15 @@
 
     # Project branches
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
       - oxygen:
           branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+          disable-job: 'true'
 
     install:
       - all:
@@ -25,7 +28,7 @@
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20180723-235534.431
 
     # Features to install
     install-features: 'odl-groupbasedpolicy-ofoverlay,odl-groupbasedpolicy-ui,odl-restconf-all'