X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier-csit-basic.yaml;h=6ed2d87b41e8f307550416eaaca7349242165df1;hb=7b3c812037f9253497047e047d81d4fd12a2ee47;hp=e47ff6afce623662c57551332eac770897e3ca7e;hpb=825522244d6e1ca51d6c887b30ad5cf1acb4593a;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index e47ff6afc..6ed2d87b4 100644
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -2,40 +2,32 @@
 - 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'
+    disable-job: true
 
     # The functionality under test
     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:
+      - aluminium:
           branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          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:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'