Merge "Update Ubuntu 14.04 image"

[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 20f4c4ba797939e0ac84c895331150cf31f0edd5..6c160b554ee743717ca02a8b1a65299384a35b02 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name
@@ -13,13 +13,12 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
 
     install:
       - all:
@@ -27,7 +26,7 @@
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20171016-0224
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
 
     # Features to install
     install-features: >