Merge "Update cloud image CentOS7 devstack rocky"

[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 977c28084d19cc17516ca77b6839869b636f170a..2479a07297e59589360d77c602d5d68b799ecf95 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -2,43 +2,40 @@
 - project:
     name: bier-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - 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.
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - silicon:
+          branch: "master"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+      - magnesium:
+          branch: "stable/magnesium"
+          jre: "openjdk11"
+      - sodium:
+          branch: "stable/sodium"
 
-    # TODO: Delete the following if suites are compatible with Nitrogen again.
-    verify-stream: 'nitrogen'
-    # TODO: Remove the lines above and below when nitrogen becomes the default csit-verify stream.
-    verify-branch: 'master'
+    verify-stream: "sodium"
+    verify-branch: "stable/sodium"
+    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: ""