Switch the csit-1node to use job prefix

[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 561df443edce6a4f4fb60bbda97e7fd79114f710..8e5af5eac909f5b537123851bc7266a0e6660da5 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name
@@ -12,30 +13,27 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # 6 Ubuntu VMs in JCloud configuration
     tools_system_count: 6
-    tools_system_image: Ubuntu 14.04 - gbp - 20170117-0042
+    tools_system_image: ZZCI - Ubuntu 16.04 - gbp - 20171213-2018
 
     # Features to install
-    install-features: 'odl-groupbasedpolicy-ofoverlay,
-                       odl-groupbasedpolicy-ui,
-                       odl-restconf-all'
+    install-features: >
+        odl-groupbasedpolicy-ofoverlay,
+        odl-groupbasedpolicy-ui,
+        odl-restconf-all
 
     # Robot custom options
     robot-options: ''