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

diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml
index e47ff6afc..94459efaf 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'
@@ -19,23 +19,17 @@
       # Nitrogen if needed.
       - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          karaf-version: 'karaf3'
 
-    # 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-branch: 'stable/nitrogen'
+    verify-karaf-version: 'karaf4'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'