Merge "Skip SFT during mdsal-sonar"

[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 891ff9a3ab731244c4af5dac1dd18e50ef4054aa..c955dbccf8be2feaa9b5c03ecd5bb019e7270ee4 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
@@ -2,24 +2,24 @@
 - project:
     name: groupbasedpolicy-csit-6node
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
 
     # The project name
     project: 'groupbasedpolicy'
+    disable-job: true
 
     # The functionality under test
     functionality: '6node'
 
     # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-      - carbon:
-          branch: 'stable/carbon'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
     install:
       - all:
@@ -27,7 +27,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: >