From c976701a88e7e13db92e69ce73c91486655978eb Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Thu, 15 Sep 2022 15:51:16 -0700 Subject: [PATCH] Update Java version & build node for Sonar jobs Chlorine requires Java 17 & CentOS 8. Update the configuration of Jenkins Sonar jobs for the following projects: - bgpcep - daexim - jsonrpc - lispflowmapping - openflowplugin - ovsdb - serviceutils Also, remove unnecessary 'mvn-goals' from lispflowmapping, openflowplugin & ovsdb - this causes build failure in the sandbox. Change-Id: Iae5d02800c85b5a86492af4f3967122fb33752e4 Signed-off-by: Sangwook Ha --- jjb/bgpcep/bgpcep.yaml | 4 ++-- jjb/daexim/daexim.yaml | 3 ++- jjb/jsonrpc/jsonrpc.yaml | 3 ++- jjb/lispflowmapping/lispflowmapping.yaml | 4 ++-- jjb/openflowplugin/openflowplugin.yaml | 5 ++--- jjb/ovsdb/ovsdb.yaml | 5 ++--- jjb/serviceutils/serviceutils.yaml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index ac68c71df..89eb1154a 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -122,10 +122,10 @@ project: "bgpcep" project-name: "bgpcep" - build-node: centos7-builder-8c-8g + build-node: centos8-builder-8c-8g build-timeout: 120 branch: "master" - java-version: "openjdk11" + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "bgpcep-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 6b3682242..3bcb29b00 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -84,7 +84,8 @@ project: "daexim" project-name: "daexim" branch: "master" - java-version: "openjdk11" + build-node: centos8-builder-4c-4g + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "daexim-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 66597758c..64129a209 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -94,8 +94,9 @@ project: "jsonrpc" project-name: "jsonrpc" - java-version: "openjdk11" + java-version: "openjdk17" branch: "master" + build-node: centos8-builder-4c-4g mvn-version: mvn38 mvn-settings: "jsonrpc-settings" mvn-opts: "-Xmx1024m" diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index c9f945dfd..33385c4ba 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -105,10 +105,10 @@ project: "lispflowmapping" project-name: "lispflowmapping" branch: "master" - java-version: "openjdk11" + build-node: centos8-builder-4c-4g + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "lispflowmapping-settings" - mvn-goals: "clean deploy -DrepoBuild" mvn-opts: "-Xmx2048m -Dmaven.compile.fork=true" sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 71551c23d..25825d077 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -106,12 +106,11 @@ project: "openflowplugin" project-name: "openflowplugin" branch: "master" - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g build-timeout: 90 - java-version: "openjdk11" + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "openflowplugin-settings" - mvn-goals: "clean deploy javadoc:aggregate" sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 1f754bcd2..6d7a12d38 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -87,12 +87,11 @@ project: "ovsdb" project-name: "ovsdb" branch: "master" - build-node: centos7-builder-4c-4g + build-node: centos8-builder-4c-4g build-timeout: 90 - java-version: "openjdk11" + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "ovsdb-settings" - mvn-goals: "clean deploy javadoc:aggregate" sonarcloud: true sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-api-token: "{sonarcloud_api_token}" diff --git a/jjb/serviceutils/serviceutils.yaml b/jjb/serviceutils/serviceutils.yaml index cba15c113..7bba04192 100644 --- a/jjb/serviceutils/serviceutils.yaml +++ b/jjb/serviceutils/serviceutils.yaml @@ -105,8 +105,8 @@ project: "serviceutils" project-name: "serviceutils" branch: "master" - build-node: centos7-builder-4c-4g - java-version: "openjdk11" + build-node: centos8-builder-4c-4g + java-version: "openjdk17" mvn-version: mvn38 mvn-settings: "serviceutils-settings" mvn-opts: "-Xmx1024m" -- 2.36.6