X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgroupbasedpolicy%2Fgroupbasedpolicy-csit-6node.yaml;h=f54fbb8f7d2e2afb9c5d12aaf6454ea97259fc08;hb=b0ee3dcc9ba7c94a5969548f7e818894e65b05d9;hp=be2a0b9a29820d85b16d844915c29513a82213aa;hpb=a74d584f4d4ce617ebf1cfbc5097fd5b9e38b631;p=releng%2Fbuilder.git

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
index be2a0b9a2..1444524aa 100644
--- 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,38 +13,29 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - 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
-    mininet-image: 'gbp-trusty'
-    mininet-vms: 6
+    tools_system_count: 6
+    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: '-v ODL_VERSION:{stream}'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'groupbasedpolicy-distribution-{stream},
-                   neutron-distribution-{stream},
-                   ovsdb-distribution-{stream},
-                   openflowplugin-distribution-{stream},
-                   sfc-distribution-{stream},
-                   dlux-distribution-{stream}'
+    robot-options: ''