Fix: Override javadoc jobs' java-version

We are using a simple job group from global-jjb, which is not picking up
our default java-version. Fix this up by explicitly setting it.

Change-Id: I9ac499dfeb92a26cf09f03fc3b91155b8349fb55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml
index 71371c2ad500f6580e8322ec179a277ebc4dedb8..8d7b77e0fcd3fd5735acc4771c81c371073eaba0 100644 (file)
--- a/jjb/bgpcep/bgpcep.yaml
+++ b/jjb/bgpcep/bgpcep.yaml
@@ -4,6 +4,7 @@
     jobs:
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
+          java-version: openjdk17
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: bgpcep
@@ -35,6 +36,7 @@
     jobs:
       - "{project-name}-maven-javadoc-jobs":
           mvn-version: mvn38
+          java-version: openjdk17
       - "{project-name}-rtd-jobs":
           build-node: centos8-builder-2c-2g
           project-pattern: bgpcep

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index 4e865cf5f5f4fdeaa916608bd82290bccbddb53e..b4f4d5e3303a596f4120718fb8309167dd39e747 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -5,6 +5,7 @@
       - "{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: lispflowmapping
@@ -37,6 +38,7 @@
       - "{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: lispflowmapping
@@ -69,6 +71,7 @@
       - "{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: lispflowmapping

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 5ce937765b1955e3fe15384e367d60cc43c263e5..be26b0c88a67d4cecc556cfa68bdcb58b6af46ae 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -5,6 +5,7 @@
       - "{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
           doc-dir: .tox/docs/tmp/html
@@ -36,6 +37,7 @@
       - "{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
           doc-dir: .tox/docs/tmp/html
@@ -67,6 +69,7 @@
       - "{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
           doc-dir: .tox/docs/tmp/html

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index eddc32fcbbe36c4fa97b76f843d275c563d2c2b0..8aa84e8c5e959fe7884d5d2217ede5038a7b754b 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -5,6 +5,7 @@
       - "{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
@@ -30,6 +31,7 @@
       - "{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
@@ -55,6 +57,7 @@
       - "{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

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index d6e4f142bf6badfb6c1eaede8b874e4964d6528f..317413204228e961c0c4c5d85ab3f22eef938d9e 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -5,6 +5,7 @@
       - "{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: serviceutils
@@ -36,6 +37,7 @@
       - "{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: serviceutils
@@ -67,6 +69,7 @@
       - "{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: serviceutils