Remove nitrogen branches in projects

[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 6fb0a417b7ed3276925a4fc6f35d6035d2a8bb32..67dcb5c018458403ead684230a222ba0f3d60d43 100644 (file)
--- 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,22 +13,16 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-\r
-    # TODO: Delete the following if suites are compatible with Boron again.\r
-    verify-stream: 'carbon'\r
-    # TODO: Remove the lines above and below when carbon becomes the default scit-verify stream.\r
-    verify-branch: 'master'\r
-    # TODO: Update the line above when stable/carbon is created.
+      - oxygen:
+          branch: 'stable/oxygen'
+
+    verify-stream: 'oxygen'
+    verify-branch: 'stable/oxygen'
+    verify-karaf-version: 'karaf4'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'