Merge "Do not specify jre or jdk if default value applies"

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

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index 53b5ebcd5ef16e45ebf6720d1f0613821d8fa460..b9a00653cf0005d1704efac23f1567b319ee9229 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -12,33 +12,15 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - 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'
-          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'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'