From b727b9540f52904c0fb11e7d3b733fd3ff600cf6 Mon Sep 17 00:00:00 2001 From: waynedunican Date: Tue, 15 Aug 2023 11:03:38 +0100 Subject: [PATCH] [POLICY] Add java17 jobs Issue-ID: POLICY-4785 Change-Id: Ieffd627a8d32ad19586c7a5e535121da8501b9f1 Signed-off-by: waynedunican --- jjb/policy/policy-apex-pdp.yaml | 39 ++++++++++++++++++++++++++++++++++-- jjb/policy/policy-api.yaml | 39 ++++++++++++++++++++++++++++++++++-- jjb/policy/policy-clamp.yaml | 40 +++++++++++++++++++++++++++++++++++-- jjb/policy/policy-common.yaml | 29 +++++++++++++++++++++++++-- jjb/policy/policy-distribution.yaml | 39 ++++++++++++++++++++++++++++++++++-- jjb/policy/policy-models.yaml | 39 ++++++++++++++++++++++++++++++++++-- jjb/policy/policy-pap.yaml | 39 ++++++++++++++++++++++++++++++++++-- jjb/policy/policy-parent.yaml | 27 ++++++++++++++++++++++++- 8 files changed, 276 insertions(+), 15 deletions(-) diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 3aeaf1891..ed43f4a7d 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -34,6 +34,41 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-apex-pdp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-apex-pdp-java11 + project-name: "policy-apex-pdp" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-profile: "docker" + mvn-params: "-P docker" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/apex-pdp" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -64,7 +99,7 @@ project-name: "policy-apex-pdp" branch: "master" mvn-settings: "policy-apex-pdp-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -79,4 +114,4 @@ - "master": branch: "master" mvn-settings: "policy-apex-pdp-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index c194f3641..37bfeaa7d 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -28,6 +28,41 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-api-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-api-java11 + project-name: "policy-api" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/api" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -58,7 +93,7 @@ project-name: "policy-api" branch: "master" mvn-settings: "policy-api-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -73,4 +108,4 @@ - "master": branch: "master" mvn-settings: "policy-api-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index 7f8651eb9..9758bbaea 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -29,6 +29,42 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-clamp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-clamp-java11 + project-name: "policy-clamp" + jobs: + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sbom-generator: true + maven-versions-plugin: true + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -P docker" + - "{project-name}-{stream}-verify-java": + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-16g + - "{project-name}-{stream}-merge-java": + build-node: ubuntu1804-docker-8c-16g + mvn-params: "-P docker" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/clamp" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -61,7 +97,7 @@ mvn-settings: "policy-clamp-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 + java-version: openjdk17 - project: name: policy-clamp-clm @@ -75,4 +111,4 @@ branch: "master" mvn-settings: "policy-clamp-settings" build-node: ubuntu1804-docker-8c-8g - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index fa613e75d..4d611a83c 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -18,6 +18,31 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-common-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-common-java11 + project-name: "policy-common" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/common" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -48,7 +73,7 @@ project-name: "policy-common" branch: "master" mvn-settings: "policy-common-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -63,4 +88,4 @@ - "master": branch: "master" mvn-settings: "policy-common-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 1b2eb70ab..773d2a32a 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -28,6 +28,41 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-distribution-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-distribution-java11 + project-name: "policy-distribution" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/distribution" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -58,7 +93,7 @@ project-name: "policy-distribution" branch: "master" mvn-settings: "policy-distribution-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -73,4 +108,4 @@ - "master": branch: "master" mvn-settings: "policy-distribution-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 5f3272efa..bdc629295 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -28,6 +28,41 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-models-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-models-java11 + project-name: "policy-models" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/models" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -58,7 +93,7 @@ project-name: "policy-models" branch: "master" mvn-settings: "policy-models-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -73,4 +108,4 @@ - "master": branch: "master" mvn-settings: "policy-models-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 399ba8c2d..7716dd9f3 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -28,6 +28,41 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-pap-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-pap-java11 + project-name: "policy-pap" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/pap" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -58,7 +93,7 @@ project-name: "policy-pap" branch: "master" mvn-settings: "policy-pap-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -73,4 +108,4 @@ - "master": branch: "master" mvn-settings: "policy-pap-settings" - java-version: openjdk11 + java-version: openjdk17 diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 803886778..24c126e1d 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -18,6 +18,31 @@ stream: - "master": branch: "master" + - "java-17": + branch: "java-17" + mvn-settings: "policy-parent-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-parent-java11 + project-name: "policy-parent" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/parent" + stream: - "honolulu": branch: "honolulu" - "istanbul": @@ -45,4 +70,4 @@ - "master": branch: "master" mvn-settings: "policy-parent-settings" - java-version: openjdk11 + java-version: openjdk17 -- 2.16.6