Merge "Update cloud image CentOS7 devstack stein"

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

diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml
index de0d01ad9f79b87d74d7444822e575849dbf6804..5efea41d877f23deccbb5724dbfaa2e7d107ba02 100644 (file)
--- a/jjb/netconf/netconf-clustering.yaml
+++ b/jjb/netconf/netconf-clustering.yaml
@@ -1,34 +1,35 @@
+---
 - 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:
-        - boron:
-            branch: 'master'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - phosphorus:
+          branch: "master"
+          jre: "openjdk11"
+      - silicon:
+          branch: "stable/silicon"
+          jre: "openjdk11"
+      - aluminium:
+          branch: "stable/aluminium"
+          jre: "openjdk11"
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: "only"
 
     # 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'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'
+    robot-options: "-v USE_NETCONF_CONNECTOR:False"