Merge "yaml file for bundle-based-reconciliaion script"

[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 b81be3924a22a78ab40bf9bdffa63a515dc56ac7..56ab3272c4899897af5c4c6482a0cf64e987a123 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -2,8 +2,8 @@
 - 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'
@@ -13,19 +13,12 @@
 
     # Project branches
     stream:
-      - carbon:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -33,7 +26,9 @@
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app'
+    install-features: >
+        odl-restconf-noauth,
+        odl-clustering-test-app
 
     # Robot custom options
     robot-options: ''