Switch the csit-verify-1node to use job prefix

[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 b171973b896d8cd6d3f862c4fb04d5dd2591691f..f4b88271cc25ad09ce1143a7eb95a0f8718dc635 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -3,7 +3,7 @@
     name: bier-csit-basic
     jobs:
       - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'bier'
@@ -13,22 +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'
 
-    # 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'