Merge "Move netvirt Sonar scan to Sonarcloud"

[releng/builder.git] / jjb / ovsdb / ovsdb-csit-clustering.yaml

diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml
index a101c014c0760671c7802d802e8a4e57860b0906..046a98406d51c559ea8c7d972503b1021f7bbff0 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -2,8 +2,8 @@
 - project:
     name: ovsdb-csit-clustering
     jobs:
-      - '{project}-csit-3node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-3node-{functionality}'
+      - inttest-csit-3node
+
     # The project name
     project: 'ovsdb'
 
@@ -14,24 +14,21 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - aluminium:
           branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+          jre: 'openjdk11'
+      - magnesium:
+          branch: 'stable/magnesium'
+          jre: 'openjdk11'
+      - sodium:
+          branch: 'stable/sodium'
 
     install:
       - only:
           scope: 'only'
 
     # Features to install
-    install-features: 'odl-ovsdb-southbound-impl-rest,decanter-collector-jmx,decanter-appender-elasticsearch'
+    install-features: 'odl-ovsdb-southbound-impl-rest'
 
     # Robot custom options
     robot-options: ''