Merge "Remove odlparent-3.0.x jobs"

[releng/builder.git] / jjb / controller / controller-csit-clustering.yaml

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 6a0fd9205823945c1604b8853cefab44c4f9d726..737c6e0ab649c96d38a16c9726fad8f5ed179a06 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,39 +2,31 @@
 - project:
     name: controller-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+      - inttest-csit-verify-3node
 
-    # The project name
     project: 'controller'
+    functionality:
+      - 'clustering-ask'
+      - 'clustering-tell'
 
-    # The functionality under test
-    functionality: 'clustering'
-
-    # Project branches
     stream:
-      - oxygen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
       - all:
           scope: 'all'
 
-    # No tools system VMs needed in JCloud configuration
     tools_system_count: 0
 
-    # Features to install
     install-features: >
-        odl-restconf-noauth,
+        odl-restconf,
         odl-clustering-test-app
-
-    # Robot custom options
-    robot-options: ''