Allow usage of MRI distribution in csit

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

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index 141e30170f218409071005498e599f2a5bb9cc59..3e98cc930d0a0a5fad28551415ad653573953889 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -2,39 +2,36 @@
 - project:
     name: netconf-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - inttest-csit-3node
 
     # The project name
-    project: 'netconf'
+    project: "netconf"
 
     # The functionality under test
-    functionality: 'clustering'
+    functionality: "clustering"
 
     # Project branches
     stream:
-      - 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
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
+
+    karaf-version: netconf
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: "only"
 
     # Features to install
     install-features: >
-        odl-restconf,
-        odl-netconf-clustered-topology
+      odl-restconf,
+      odl-netconf-clustered-topology
 
     # Robot custom options
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"