Merge "Increase mdsal build timeout"

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

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 0608f9cb3c42b1bbdc0427766346fc212ec0f932..af71e7880234f1d15c0b6d4acb67212e752dfa9a 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ovsdb-magnesium
+    name: ovsdb-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -10,18 +10,17 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs:
-          java-version:
-            - openjdk11
+      - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     project: 'ovsdb'
     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}'
@@ -31,7 +30,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-sodium
+    name: ovsdb-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -40,17 +39,18 @@
           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}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/sodium'
+    branch: 'stable/magnesium'
     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}'
@@ -60,7 +60,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-neon
+    name: ovsdb-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -75,10 +75,10 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'
@@ -89,7 +89,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-fluorine
+    name: ovsdb-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -101,10 +101,13 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
     project: 'ovsdb'
     project-name: 'ovsdb'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m'