Merge "Switch global-jjb jobs to use mvn35"

[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 d8db329866620203a2b26526f9cb4716e5725873..a0f6b62e87416948e328fe66710f4b3aff809b58 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
@@ -1,8 +1,8 @@
+---
 - project:
     name: groupbasedpolicy-csit-3node
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-
+      - inttest-csit-1node
 
     # The project name
     project: 'groupbasedpolicy'
@@ -12,25 +12,18 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # 3 Ubuntu VMs in JCloud configuration
     tools_system_count: 3
-    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'