X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb.yaml;h=b4b60443efa9f22a4d486cc888c395c672e7aeca;hb=b945ca55919ab85d8f8dae14dc4b909c2d6a312d;hp=af2ec28f0f198968a32101e1a1a6a0e5a739a593;hpb=5fdd3e5e79e4646b041203e7219729617d5e676f;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index af2ec28f0..b4b60443e 100644
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,93 +1,93 @@
 ---
 - project:
-    name: ovsdb-aluminium
+    name: ovsdb-calcium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+          java-version: openjdk17
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    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}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    stream: calcium
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"
+    mvn-settings: "ovsdb-settings"
+    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-magnesium
+    name: ovsdb-potassium
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+          java-version: openjdk17
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-builder-2c-2g
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - 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
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    stream: magnesium
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    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}'
-    email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
+    stream: potassium
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "stable/potassium"
+    mvn-settings: "ovsdb-settings"
+    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-sodium
+    name: ovsdb-argon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-rtd-jobs':
-          build-node: centos7-builder-2c-2g
+      - "{project-name}-distribution-check-{stream}"
+      - "{project-name}-maven-javadoc-jobs":
+          mvn-version: mvn38
+          java-version: openjdk17
+      - "{project-name}-rtd-jobs":
+          build-node: centos8-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
+      - odl-maven-jobs-jdk17
+      - odl-maven-verify-jobs-jdk17
 
-    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
-    block_on_csit: false
-
-    stream: sodium
-    project: 'ovsdb'
-    project-name: 'ovsdb'
-    branch: 'stable/sodium'
-    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]'
+    stream: argon
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "stable/argon"
+    mvn-settings: "ovsdb-settings"
+    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-sonar
+    jobs:
+      - odl-sonar-jobs-jdk17
+
+    project: "ovsdb"
+    project-name: "ovsdb"
+    branch: "master"
+    build-timeout: 90
+    mvn-settings: "ovsdb-settings"
+
 - project:
     name: ovsdb-info
     jobs: