Merge "Add Boron branch and csit jobs for jsonrpc"

[releng/builder.git] / jjb / netconf / netconf-scale.yaml

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 53b5ebcd5ef16e45ebf6720d1f0613821d8fa460..7ea02b322b9f82c74f932ee3e7b2d074f8e92cab 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,22 +12,17 @@
 
     # Project branches
     stream:
-      - carbon:
+      - nitrogen:
           branch: 'master'
           jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
       - boron:
           branch: 'stable/boron'
           jre: 'openjdk8'
-          install-features: >
-              odl-restconf,
-              odl-clustering-test-app,
-              odl-netconf-mdsal,
-              odl-netconf-connector-all,
-              odl-netconf-topology
-          robot-options: '-v USE_NETCONF_CONNECTOR:True'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+          karaf-version: karaf3
           install-features: >
               odl-restconf,
               odl-clustering-test-app,