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 c4f868330e24f67cae0959087db2c755a2ec5ae3..737c6e0ab649c96d38a16c9726fad8f5ed179a06 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -5,33 +5,28 @@
       - 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:
-      - fluorine:
+      - sodium:
           branch: 'master'
+      - 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
-    # We do not need to explicitly install restconf here (which is not brought in by the clustering-test-app)
-    # because this project will only create the -all- job which will automatically install the compatible with
-    # all feature set. That feature set will bring in restconf, which is required by the CSIT suites. If/When
-    # the -only- version of this job is brought back, we'll need to take that in to consideration.
     install-features: >
+        odl-restconf,
         odl-clustering-test-app
-
-    # Robot custom options
-    robot-options: ''