Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / ovsdb / ovsdb-patch-test.yaml

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index a07b96cc69de838a8de70fc2686280c640e3717c..bddbd9042f88f77dc258b531c7e61161d06c3ad6 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -2,39 +2,30 @@
 - project:
     name: ovsdb-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
-    project: 'ovsdb'
+    project: "ovsdb"
+    java-version: "openjdk17"
+    mvn-version: "mvn38"
 
     stream:
-      - oxygen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-          karaf-version: karaf3
+      - argon:
+          branch: "master"
+      - chlorine:
+          branch: "stable/chlorine"
+      - sulfur:
+          branch: "stable/sulfur"
+          java-version: "openjdk11"
+
+    os-branch: "queens"
+    jdk: "openjdk8"
 
     feature:
       - genius:
           csit-list: >
-              genius-csit-1node-genius-all-{stream}
-      - netvirt:
-          csit-list: >
-              netvirt-csit-1node-openstack-ocata-gate-stateful-{stream}
-      - l2gw:
-          csit-list: >
-              netvirt-csit-hwvtep-1node-openstack-ocata-gate-stateful-{stream}
-
+            genius-csit-1node-gate-only-{stream}
       - core:
           csit-list: >
-              ovsdb-csit-1node-gate-southbound-all-{stream},
-              ovsdb-csit-3node-gate-clustering-only-{stream}
+            ovsdb-csit-1node-gate-southbound-all-{stream},
+            ovsdb-csit-3node-gate-clustering-only-{stream}