From: Jessica Wagantall Date: Mon, 27 Feb 2023 17:42:15 +0000 (+0000) Subject: Merge "Fix Java compile config for ccsdk and sdnc" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=ef66a20c4bef1cb5f4bfe97921a9d96e66472558;hp=-c;p=ci-management.git Merge "Fix Java compile config for ccsdk and sdnc" --- ef66a20c4bef1cb5f4bfe97921a9d96e66472558 diff --combined jjb/ccsdk/apps.yaml index 246538982,66210a3ea..2b277ba4f --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@@ -15,7 -15,7 +15,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' @@@ -28,17 -28,16 +28,16 @@@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/apps' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be @@@ -69,7 -68,7 +68,7 @@@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-apps-clm diff --combined jjb/ccsdk/ccsdk-oran.yaml index 582abd305,3c01aed4e..ec57b889b --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@@ -9,7 -9,7 +9,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' mvn-opts: '-Ddocker.skip=true' @@@ -23,16 -23,15 +23,15 @@@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/oran' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' @@@ -87,6 -86,6 +86,6 @@@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' mvn-opts: '-Ddocker.skip=true' mvn-params: '-f a1-policy-management' diff --combined jjb/ccsdk/distribution.yaml index 95f2294c2,807d52637..5f11f9263 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@@ -9,7 -9,7 +9,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' maven-versions-plugin: true @@@ -23,17 -23,16 +23,16 @@@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk11 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' diff --combined jjb/ccsdk/features.yaml index 0ea946420,0266fe9a3..862aea035 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@@ -9,23 -9,24 +9,24 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/features' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 + mvn-opts: '-Xmx3072m' - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 + mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be @@@ -35,7 -36,6 +36,6 @@@ deployAtEnd=true files: '**' archive-artifacts: '' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: centos8-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@@ -57,7 -57,7 +57,7 @@@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' + mvn-opts: '-Xmx3072m' - project: name: ccsdk-features-clm @@@ -72,7 -72,7 +72,7 @@@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' + mvn-opts: '-Xmx3072m' build-node: centos8-builder-4c-4g - project: diff --combined jjb/ccsdk/odl-legacy.yaml index 34c716e33,4e6cdceb5..5bab8f2bb --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@@ -15,7 -15,7 +15,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' @@@ -58,7 -58,7 +58,7 @@@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-odl-legacy-clm diff --combined jjb/ccsdk/parent.yaml index 803d4eba1,72a3fa473..0134d6c8b --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@@ -9,13 -9,13 +9,13 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@@ -23,6 -23,7 +23,7 @@@ stream: - 'master': branch: 'master' + java-version: openjdk17 jobs: - gerrit-maven-verify: mvn-params: '-Drevision=3.0.0-SNAPSHOT' @@@ -32,11 -33,9 +33,9 @@@ mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0' - '{project-name}-gerrit-release-jobs': mvn-params: '-Drevision=3.0.0' - - 'jakarta': - branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be diff --combined jjb/ccsdk/sli.yaml index 2f4738e96,7effd820b..ff6eca062 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@@ -9,23 -9,22 +9,22 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/sli' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' # due to a strange macro / variable translation problem this needs to be @@@ -56,7 -55,7 +55,7 @@@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-sli-clm diff --combined jjb/sdnc/sdnc-apps.yaml index 408f7b35e,0293a9e10..706184ba7 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@@ -18,7 -18,7 +18,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' @@@ -31,17 -31,16 +31,16 @@@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/apps' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@@ -74,7 -73,7 +73,7 @@@ mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' maven-version: "mvn38" # diff --combined jjb/sdnc/sdnc-northbound.yaml index d1711b502,f9b715eba..1330b3b79 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@@ -8,21 -8,20 +8,20 @@@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g cron: '' sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/northbound' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' @@@ -55,7 -54,7 +54,7 @@@ mvn-goals: 'clean install' java-version: openjdk17 mvn-version: "mvn38" - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: sdnc-northbound-clm diff --combined jjb/sdnc/sdnc-oam.yaml index b59f3f66d,c61b7aca3..4c2e6f05c --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@@ -9,7 -9,7 +9,7 @@@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' @@@ -22,16 -22,15 +22,15 @@@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/oam' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**'