Merge "Upgrade OVS dep for opflex from 2.6.7 to 2.12.0"

[releng/builder.git] / jjb / ovsdb / ovsdb.yaml

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 487a7eda0281d376e58d50e91dc633f79662f389..1a9736ff9c6a01d8f2cd1ec8b597d74c4e5aec9d 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -9,7 +9,7 @@
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
@@ -20,6 +20,7 @@
     project-name: 'ovsdb'
     branch: 'master'
     build-node: centos7-builder-2c-8g
+    java-version: 'openjdk11'
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
@@ -86,32 +87,6 @@
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- project:
-    name: ovsdb-fluorine
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
-          project-pattern: ovsdb
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
-          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: fluorine
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/fluorine'
-    build-node: centos7-builder-2c-8g
-    mvn-settings: 'ovsdb-settings'
-    mvn-opts: '-Xmx1024m'
-    dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
-
 - project:
     name: ovsdb-view
     views: