From 767ecdbbaff261c89236f64fc60698db41d7b340 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 9 Jun 2022 11:32:27 +0200 Subject: [PATCH] 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 --- jjb/daexim/daexim.yaml | 6 ++---- jjb/jsonrpc/jsonrpc.yaml | 6 ++---- jjb/lispflowmapping/lispflowmapping.yaml | 5 ++--- jjb/openflowplugin/openflowplugin.yaml | 5 ++--- jjb/ovsdb/ovsdb.yaml | 8 ++++---- jjb/serviceutils/serviceutils.yaml | 6 ++---- 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 3b896884d..6b3682242 100644 --- 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 454d692ed..66597758c 100644 --- 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 b8e31e251..c9f945dfd 100644 --- 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 d606e8fa5..71551c23d 100644 --- 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 c5d4978cc..1f754bcd2 100644 --- 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 764cb924b..cba15c113 100644 --- 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}, -- 2.36.6