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 72371b93a000410f364c156bd0ebb2040aa24de7..737c6e0ab649c96d38a16c9726fad8f5ed179a06 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -1,38 +1,32 @@
+---
 - 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:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - sodium:
+          branch: 'master'
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
+      - oxygen:
+          branch: 'stable/oxygen'
+          disable-job: 'true'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
-    # No tools system VMs needed in JCloud configuration
     tools_system_count: 0
 
-    # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
-
-    # Robot custom options
-    robot-options: ''
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app