Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / iotdm / iotdm-csit-basic.yaml

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 53f4e54f59ac02b1c91d7be6390c7aaff37faddd..6c53fd8029fd1c894b813f62d13aa9d79e7d8f6b 100644 (file)
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -2,8 +2,8 @@
 - project:
     name: iotdm-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: 'iotdm'
@@ -13,28 +13,20 @@
 
     # Project branches
     stream:
-      # Removed jobs testing Beryllium and Boron branches due to
-      # backward incompatible changes in test suites for Carbon
-      # TODO: Create test suites for specific release before
-      # Carbon if needed.
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-
-    # 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: 'master'
-    # TODO: Update the line above when stable/carbon is created.
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-onem2mall-iotdm'
+    install-features: 'odl-iotdmcsitdist'
 
     # Robot custom options
     robot-options: ''