Merge "Make distribution test job run daily for active branches"

[releng/builder.git] / jjb / armoury / armoury-csit-basic.yaml

diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml
index 2f24991e076c778c70a1f8a67db5e86867783f12..0e239f3a52fb9df836e7663ca268fb31beea7df6 100644 (file)
--- a/jjb/armoury/armoury-csit-basic.yaml
+++ b/jjb/armoury/armoury-csit-basic.yaml
@@ -12,12 +12,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
-            jdk: 'openjdk8'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jdk: 'openjdk7'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -26,10 +29,9 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-armoury-workloadmanager'
+    install-features: >
+        odl-restconf,
+        odl-armoury-workloadmanager
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},mdsal-distribution-{stream},armoury-distribution-{stream}'