Merge "Push OpFlex artifacts to Nexus repository."

[releng/builder.git] / jjb / netconf / netconf-cluster-stress.yaml

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 07bf090903b0cee97d54d857c1591161aadd9973..8cab4579a13a203cb874bdd99c1489790ab488ec 100644 (file)
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -12,9 +12,12 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - oxygen:
           branch: 'master'
           jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
       - carbon:
           branch: 'stable/carbon'
           jre: 'openjdk8'
@@ -23,10 +26,6 @@
           branch: 'stable/boron'
           jre: 'openjdk8'
           karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
 
     install:
       - only:
@@ -35,11 +34,11 @@
           scope: 'all'
 
     # Features to install
-    # odl-jolokia is added automatically just because this is a 3node job.
-    # Netconf clustered feature is installed at runtime.
     install-features: >
         odl-restconf,
-        odl-netconf-ssh
+        odl-jolokia,
+        odl-netconf-clustered-topology
 
     # Robot custom options
+    # TODO: Make sure every suite has this as default, then remove this value from here.
     robot-options: '-v USE_NETCONF_CONNECTOR:False'