X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fiotdm%2Fiotdm-csit-basic.yaml;h=42cd514714820c48133c9bd58dad7564c69c5159;hb=e8a56411730412990a7ad3ef97bcee5643d981a9;hp=36d0ed742ed5b3566b84b2727d44e0f8b06b593e;hpb=6ee6113bf1481d18afd435718cf021cbab6deba2;p=releng%2Fbuilder.git

diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml
index 36d0ed742..42cd51471 100644
--- a/jjb/iotdm/iotdm-csit-basic.yaml
+++ b/jjb/iotdm/iotdm-csit-basic.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: iotdm-csit-basic
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'iotdm'
@@ -12,30 +13,31 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      # 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.
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          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.
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-iotdm-onem2m'
+    install-features: 'odl-iotdmcsitdist'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'iotdm-distribution-{stream}'