X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnetconf%2Fnetconf-cluster-stress.yaml;h=553106a95e80020d198bfdbaca7c3be6fc00754e;hb=4ba04d87a70d7ada15da769e3685f9938d614423;hp=3bdbcf751c96917657c0f6d4a0eb4c65c269a8a8;hpb=682f60c89897b4c12e5dfeb0597b818a7702a815;p=releng%2Fbuilder.git

diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
index 3bdbcf751..553106a95 100644
--- a/jjb/netconf/netconf-cluster-stress.yaml
+++ b/jjb/netconf/netconf-cluster-stress.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: netconf-csit-cluster-stress
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
 
     # The project name
     project: 'netconf'
@@ -11,32 +12,31 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          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-netconf-ssh,odl-restconf'
+    install-features: >
+        odl-restconf,
+        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'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs:
-        controller-distribution-{stream},
-        netconf-distribution-{stream},
-        integration-distribution-merge-{stream}