Adjust for karaf 4 not happening in carbon

[releng/builder.git] / jjb / integration / distribution / distribution-csit-userfeatures.yaml

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index c8324bda7e04569422ca7668c786c9536d1624b3..a7faae523294a5a8636a0e0c36573f62b9a5b1fb 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -1,7 +1,9 @@
+---
 - project:
     name: distribution-csit-userfeatures
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
 
     # The project name
     project: 'distribution'
@@ -11,27 +13,33 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-            robot-options: '-v USE_NETCONF_CONNECTOR:True'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-            install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
-            robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+          robot-options: '-v USE_NETCONF_CONNECTOR:True'
+      - beryllium:
+          branch: 'stable/beryllium'
+          jre: 'openjdk7'
+          karaf-version: karaf3
+          install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
+          robot-options: '-v USE_NETCONF_CONNECTOR:True'
 
     # TODO: Add Beryllium when everything is backported there.
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-distribution-version,odl-netconf-topology,odl-jolokia'
@@ -39,10 +47,5 @@
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream},
-        integration-distribution-merge-{stream}
-
     # Controller configuration
     odl_system_flavor: 8 GB General Purpose v1