Merge "Add gre type driver for dc-gw and tdd cases"

[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 bb57f39ea3d2869ca7f84fc8f24ea72bb073fe66..ba7a52179e2c495c3bbca1704831022d527bfcd2 100644 (file)
--- a/jjb/bier/bier-csit-basic.yaml
+++ b/jjb/bier/bier-csit-basic.yaml
@@ -2,34 +2,30 @@
 - 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'
+    disable-job: true
 
     # The functionality under test
     functionality: 'basic'
 
     # Project branches
     stream:
-      - nitrogen:
+      - sodium:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - neon:
+          branch: 'stable/neon'
+      - fluorine:
+          branch: 'stable/fluorine'
 
-    # 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: 'stable/carbon'
-    # TODO: Update the line above when stable/carbon is created.
+    verify-stream: 'fluorine'
+    verify-branch: 'stable/fluorine'
+    verify-karaf-version: 'karaf4'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'