Merge "'Update validate autorelease projects for fluorine"

[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 79ce7e65ef62df566d251e10cc34f992d4115649..36beac1219ae0e030beb5706778d4b79732d31b4 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -1,41 +1,25 @@
+---
 - 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'
-
-    # The functionality under test
     functionality: 'clustering'
 
-    # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
-
-    # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
+      - all:
+          scope: 'all'
 
-    # Robot custom options
-    robot-options: ''
+    tools_system_count: 0
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        odlparent-distribution-{stream},
-        yangtools-distribution-{stream},
-        mdsal-distribution-{stream},
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app