Merge "Update validate-ar jobs for silicon"

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

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index 66b7c414376cb6e1cf0c83acd628063de703d004..946e7a12d6a3f8f526d2a55cae233f520b520c05 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -6,34 +6,37 @@
       - inttest-csit-verify-1node
 
     # The project name
-    project: 'bier'
+    project: "bier"
+    disable-job: true
 
     # The functionality under test
-    functionality: 'basic'
+    functionality: "basic"
 
     # Project branches
     stream:
-      # Removed jobs testing Carbon branches due to the CSIT update
-      # incompatible changes in test suites for Nitrogen
-      # TODO: Create test suites for specific release before
-      # Nitrogen if needed.
-      - fluorine:
-          branch: 'master'
-      - oxygen:
-          branch: 'stable/oxygen'
-      - nitrogen:
-          branch: 'stable/nitrogen'
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
 
-    verify-stream: 'nitrogen'
-    verify-branch: 'stable/nitrogen'
-    verify-karaf-version: 'karaf4'
+    verify-stream: "magnesium"
+    verify-branch: "stable/magnesium"
+    verify-karaf-version: "karaf4"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-bier-all'
+    install-features: "odl-bier-all"
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""