Merge "Only use -all- job if it exists"

[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 afa92bea6a70575779032d2276c86b1f5c371ea8..977c28084d19cc17516ca77b6839869b636f170a 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -13,13 +13,27 @@
 
     # Project branches
     stream:
-      - carbon:
+      # 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
+
+    # 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'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'