Merge "Revert "Robot installation: Pinpoint pycparser version""

[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 c2acf2b51e26c381435c6fb829dc3606ac109cf9..169683650f647acfe28cee88b7e48a14c8533692 100644 (file)
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -11,9 +11,15 @@
 
     # Project branches
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     # TODO: Add Beryllium when everything is backported there.
 
@@ -24,13 +30,12 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: >
-        odlparent-distribution-{stream},
         controller-distribution-{stream},
-        netconf-distribution-{stream}
+        integration-distribution-merge-{stream}