Merge "Remove odlmicro CSIT from AR test"

[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 f0f64fac8d75bc07aa1b7eff675fc829600c7633..c110d9e5da56f37bd0f37811c92a7f2606ea3153 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -2,43 +2,37 @@
 - project:
     name: controller-csit-akka1
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'controller'
+    project: "controller"
 
     # The functionality under test
-    functionality: 'akka1'
+    functionality: "akka1"
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # No tools system VMs needed in for this job
     tools_system_count: 0
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-clustering-test-app,
-        odl-jolokia
+      odl-restconf,
+      odl-clustering-test-app,
+      odl-jolokia
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""