Fix distribution-check jobs

The distribution-check jobs are using the default value of mvn-version & java-version. Define job-groups for Java 17 & 21 which specify the Maven & Java versions and use the job-groups. Change-Id: I12084c2f0d621412707c47093445214973e1037b Signed-off-by: Sangwook Ha <[email protected]>
opendaylight · Aug 12, 2024 · 83f4a68 · 83f4a68
1 parent 0b38abb
commit 83f4a68
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 19 deletions.
diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
@@ -2,12 +2,12 @@
 - project:
     name: daexim-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -26,12 +26,12 @@
 - project:
     name: daexim-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -51,12 +51,12 @@
 - project:
     name: daexim-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
@@ -1,4 +1,22 @@
 ---
+- job-group:
+    name: distribution-check-jobs-jdk17
+
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+
+    java-version: openjdk17
+    mvn-version: mvn38
+
+- job-group:
+    name: distribution-check-jobs-jdk21
+
+    jobs:
+      - "{project-name}-distribution-check-{stream}"
+
+    java-version: openjdk21
+    mvn-version: mvn39
+
 - job-template:
     name: "{project-name}-distribution-check-{stream}"
 
@@ -26,7 +44,7 @@
     disabled: "{disable-job}"
 
     project-type: freestyle
-    node: "centos8-builder-8c-8g"
+    node: "{build-node}"
     concurrent: true
 
     properties:

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
@@ -2,12 +2,12 @@
 - project:
     name: jsonrpc-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -26,12 +26,12 @@
 - project:
     name: jsonrpc-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -51,12 +51,12 @@
 - project:
     name: jsonrpc-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -2,7 +2,6 @@
 - project:
     name: lispflowmapping-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn39
           java-version: openjdk21
@@ -11,6 +10,7 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -34,7 +34,6 @@
 - project:
     name: lispflowmapping-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -43,6 +42,7 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -69,7 +69,6 @@
 - project:
     name: lispflowmapping-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -78,6 +77,7 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
@@ -2,7 +2,6 @@
 - project:
     name: openflowplugin-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn39
           java-version: openjdk21
@@ -12,6 +11,7 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -35,7 +35,6 @@
 - project:
     name: openflowplugin-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -45,6 +44,7 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -69,7 +69,6 @@
 - project:
     name: openflowplugin-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -79,6 +78,7 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
@@ -2,7 +2,6 @@
 - project:
     name: ovsdb-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn39
           java-version: openjdk21
@@ -11,6 +10,7 @@
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -29,7 +29,6 @@
 - project:
     name: ovsdb-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -38,6 +37,7 @@
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -57,7 +57,6 @@
 - project:
     name: ovsdb-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -66,6 +65,7 @@
           project-pattern: ovsdb
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
@@ -2,7 +2,6 @@
 - project:
     name: serviceutils-scandium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn39
           java-version: openjdk21
@@ -11,6 +10,7 @@
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - distribution-check-jobs-jdk21
       - odl-maven-jobs-jdk21
       - odl-maven-verify-jobs-jdk21
 
@@ -35,7 +35,6 @@
 - project:
     name: serviceutils-calcium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -44,6 +43,7 @@
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
       - odl-maven-verify-jobs-jdk21:
@@ -70,7 +70,6 @@
 - project:
     name: serviceutils-potassium
     jobs:
-      - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
           java-version: openjdk17
@@ -79,6 +78,7 @@
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
+      - distribution-check-jobs-jdk17
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17