Ditch Chlorine/JDK11 jobs

MSI projects do not need to be verified with JDK11, let's use JDK17
only.

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 3b896884dd91771b3749bc57dd7c87f96ce47faa..6b36822421ca561a6d513bd437a45087d46f098d 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -8,18 +8,16 @@
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     project: "daexim"
     project-name: "daexim"
     stream: chlorine
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "daexim-settings"
     build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
     email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
 

diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml
index 454d692edbd164ed4991caea135dc9bff7b7c351..66597758cbe5d76ee9b8dbf2b2e2c153522c2f5c 100644 (file)
--- a/jjb/jsonrpc/jsonrpc.yaml
+++ b/jjb/jsonrpc/jsonrpc.yaml
@@ -8,18 +8,16 @@
           project-pattern: jsonrpc
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-jsonrpc/91870/
           rtd-token: 04d31d4414734686d63f9b160e974fe5a18d031d
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     project: "jsonrpc"
     project-name: "jsonrpc"
     stream: chlorine
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     branch: "master"
     mvn-settings: "jsonrpc-settings"
     build-node: centos8-builder-4c-4g
-    mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}"
     email-upstream: "[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]"
 

diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml
index b8e31e2514ac19abae3cf1f986f1592502b9a714..c9f945dfd965f193b4550c44107b9aa4347c80e1 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping.yaml
+++ b/jjb/lispflowmapping/lispflowmapping.yaml
@@ -10,15 +10,14 @@
           project-pattern: lispflowmapping
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-lispflowmapping/47783/
           rtd-token: 181be9dd804e4969b9f318a6f1988e3cbee9d9a8
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     stream: chlorine
     project: "lispflowmapping"
     project-name: "lispflowmapping"
     branch: "master"
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "lispflowmapping-settings"
     mvn-goals: "clean deploy -DrepoBuild"
     mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true"

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index d606e8fa5088c1e6648b90b02895551bf6c94384..71551c23d49dcc7a789179cbc6606e5c8336e34a 100644 (file)
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -11,8 +11,7 @@
           project-pattern: openflowplugin
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     stream: chlorine
@@ -21,7 +20,7 @@
     branch: "master"
     build-node: centos8-builder-4c-4g
     build-timeout: 90
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "openflowplugin-settings"
     mvn-goals: "clean deploy javadoc:aggregate"
     dependencies: >

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index c5d4978cc95e007f41a7b2b67531249d1759737a..1f754bcd2b4832596089828dc329ab1569b4f37e 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -10,15 +10,15 @@
           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
 
     stream: chlorine
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
-    build-node: centos7-builder-4c-4g
-    java-version: "openjdk11"
+    build-node: centos8-builder-4c-4g
+    java-version: "openjdk17"
     mvn-settings: "ovsdb-settings"
     dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
     email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"

diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml
index 764cb924b1a00abc47c635433729e1f5be20a8bb..cba15c113551355857ab4bdc3041ddd6bb3c749a 100644 (file)
--- a/jjb/serviceutils/serviceutils.yaml
+++ b/jjb/serviceutils/serviceutils.yaml
@@ -10,8 +10,7 @@
           project-pattern: serviceutils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-serviceutils/40541/
           rtd-token: 866f76be38ed7efc7027b9c52e7ad869e523e7c4
-      - odl-maven-jobs-jdk11
-      - odl-maven-verify-jobs
+      - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
 
     branch: "master"
@@ -20,9 +19,8 @@
     project: "serviceutils"
     project-name: "serviceutils"
     build-node: centos8-builder-2c-2g
-    java-version: "openjdk11"
+    java-version: "openjdk17"
     mvn-settings: "serviceutils-settings"
-    mvn-opts: "-Xmx1024m"
     build-timeout: 90
     dependencies: >
       controller-merge-{stream},