Merge "Re-enable orphaned nodes cleanup script"

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

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 5432a6e9b8405df5468ade193811b50e171b11e8..8131b7613f4405ae1662511e2959de581904547b 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
@@ -12,24 +12,22 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-clustered-topology'
+    install-features: >
+        odl-restconf,
+        odl-netconf-clustered-topology
 
     # Robot custom options
     robot-options: '-v USE_NETCONF_CONNECTOR:False'