X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fbier%2Fbier-csit-basic.yaml;h=94459efaf77f70085b961d59f0b706921af3f30c;hb=4ef2a863969dc4eda8c16975c8d11f7af0bdd565;hp=ac30ab545f47bbae0b8a87a3320fdf6aeb78d666;hpb=d39d37b3aeed4852cf3ed9d34fa103ad40c51494;p=releng%2Fbuilder.git

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index ac30ab545f..94459efaf7 100644
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -2,8 +2,8 @@
 - 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'
@@ -13,23 +13,23 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      # 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'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
-    # TODO: Delete the following if suites are compatible with Boron again.
-    verify-stream: 'carbon'
-    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.
-    verify-branch: 'carbon'
-    # TODO: Update the line above when stable/carbon is created.
+    verify-stream: 'nitrogen'
+    verify-branch: 'stable/nitrogen'
+    verify-karaf-version: 'karaf4'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'