X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-csit-userfeatures.yaml;h=53c400f6008e554428a60f1e866f8ed214e5fe73;hb=5d27acb6f73ee0e53234a90b95f951b648079815;hp=c2acf2b51e26c381435c6fb829dc3606ac109cf9;hpb=8b8767ffb5eefe51d96d014a5844b1cc36f7abc8;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index c2acf2b51..53c400f60 100644
--- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@ -11,9 +11,19 @@
 
     # Project branches
     stream:
-        - boron:
+        - 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'
 
     # TODO: Add Beryllium when everything is backported there.
 
@@ -24,13 +34,16 @@
             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-topology,odl-jolokia'
 
     # Robot custom options
-    robot-options: ''
+    robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Trigger jobs (upstream dependencies)
     trigger-jobs: >
-        odlparent-distribution-{stream},
         controller-distribution-{stream},
-        netconf-distribution-{stream}
+        integration-distribution-merge-{stream}
+
+    # Controller configuration
+    controller-image: 'centos7-java-builder-2c-8g'
+