Merge "Update cloud image Ubuntu18.04 mininet ovs"

[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 9282deddc588617a7f20b1123f7e5fedb5c14a8f..ebc4c7ecc40f9f80eac09cbc83372f9853000161 100644 (file)
--- a/jjb/ovsdb/ovsdb-csit-clustering.yaml
+++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml
@@ -1,38 +1,34 @@
+---
 - project:
     name: ovsdb-csit-clustering
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
-   # The project name
-    project: 'ovsdb'
+      - inttest-csit-3node
+
+    # The project name
+    project: "ovsdb"
+    jre: "openjdk17"
 
     # The functionality under test
-    functionality: 'clustering'
+    functionality:
+      - "upstream-clustering"
+      - "gate-clustering"
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - argon:
+          branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
 
     install:
-        - only:
-            scope: 'only'
+      - 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: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream}'
+    robot-options: ""