Use global-jjb maven-merge for jdk11 group

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

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index 6c160b554ee743717ca02a8b1a65299384a35b02..fe81914e88e7c0f4d030c1e5541f71ba131e5a0b 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -7,18 +7,21 @@
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '6node'
 
     # Project branches
     stream:
-      - fluorine:
+      - magnesium:
           branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+      - sodium:
+          branch: 'stable/sodium'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
       - all:
@@ -26,7 +29,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    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: >