Update Orchestration scripts to work with Vex

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

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index f4857434deba235c7f707bdc739603a29453294a..f6f3e2af740074ca9c024bade8515a35744eaa16 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -10,21 +10,16 @@
     # The functionality under test
     functionality: 'akka1'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
@@ -32,7 +27,10 @@
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app,
+        odl-jolokia
 
     # Robot custom options
     robot-options: ''