Merge "Delete nova-manage command to Fix Newton jobs"

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

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 4b3b45474ccf19c9210427d2b852bbf396765126..8678b011bc259b7fefb94ead391969d3ebd606c1 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -11,10 +11,15 @@
 
     # Project branches
     stream:
-        - beryllium:
+        - carbon:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+            jre: 'openjdk8'
+        - boron:
+            branch: 'stable/boron'
+            jre: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jre: 'openjdk7'
 
     install:
         - only:
@@ -23,7 +28,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-mdsal,odl-netconf-connector-all'
 
     # Robot custom options
     robot-options: ''
@@ -32,3 +37,6 @@
     # so the job is defined to run once a day.
     # Trigger jobs (daily)
     schedule: 'H H * * *'
+
+    # ODL system configuration
+    controller-image: 'centos7-java-builder-2c-8g'