From 9c4d2f848d14c2d2c15b3cbca3d0b64b8937d48e Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 30 Jun 2023 17:04:09 -0400 Subject: Separate java 11 and 17 streams Separate streams based on java 11 and java 17 to separate projects, since setting java-version per stream is not working at the moment. Issue-ID: CIMAN-436 Signed-off-by: Dan Timoney Change-Id: If4e3c38a8fc5902c5d33ed87ae46ad01449ac944 --- jjb/sdnc/sdnc-apps.yaml | 60 +++++++++++++++++++++++++++++++++++++------ jjb/sdnc/sdnc-northbound.yaml | 43 ++++++++++++++++++++++++++----- jjb/sdnc/sdnc-oam.yaml | 47 ++++++++++++++++++++++++++++----- 3 files changed, 130 insertions(+), 20 deletions(-) (limited to 'jjb/sdnc') diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 59343fb37..5b331f97b 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -6,7 +6,7 @@ - project-view - project: - name: sdnc-apps + name: sdnc-apps-java11 project-name: "sdnc-apps" jobs: - gerrit-maven-verify: @@ -35,15 +35,59 @@ project: "sdnc/apps" stream: - - "master": - branch: "master" - java-version: openjdk11 - "london": branch: "london" - java-version: openjdk11 - "kohn": branch: "kohn" - java-version: openjdk11 + java-version: openjdk11 + mvn-version: "mvn38" + mvn-settings: "sdnc-apps-settings" + + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + maven-version: "mvn38" + build-node: ubuntu1804-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: sdnc-apps-java17 + project-name: "sdnc-apps" + jobs: + - gerrit-maven-verify: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Ddocker.skip.push=true -Pdocker" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Pdocker" + maven-versions-plugin: true + cron: "@daily" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "sdnc/apps" + stream: + - "master": + branch: "master" + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-apps-settings" @@ -72,7 +116,7 @@ project: "sdnc/apps" project-name: "sdnc-apps" branch: "master" - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-apps-settings" mvn-goals: "clean install" @@ -90,7 +134,7 @@ stream: - "master": branch: "master" - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 4682eb291..2ef7de91e 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -1,6 +1,41 @@ --- - project: - name: sdnc-northbound + name: sdnc-northbound-java11 + project-name: "sdnc-northbound" + jobs: + - gerrit-maven-verify + - gerrit-maven-merge: + cron: "@daily" + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos8-docker-8c-8g + cron: "" + sbom-generator: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "sdnc/northbound" + stream: + - "kohn": + branch: "kohn" + java-version: openjdk11 + mvn-version: "mvn38" + mvn-settings: "sdnc-northbound-settings" + + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + maven-version: "mvn38" + build-node: ubuntu1804-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: sdnc-northbound-java17 project-name: "sdnc-northbound" jobs: - gerrit-maven-verify @@ -18,13 +53,9 @@ stream: - "master": branch: "master" - java-version: openjdk17 - "london": branch: "london" - java-version: openjdk17 - - "kohn": - branch: "kohn" - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-northbound-settings" diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 986ce2cbf..901dc31bb 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -1,6 +1,45 @@ --- - project: - name: sdnc-oam + name: sdnc-oam-java11 + project-name: "sdnc-oam" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: + build-node: centos8-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" + maven-versions-plugin: true + cron: "@daily" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + project: "sdnc/oam" + stream: + - "kohn": + branch: "kohn" + java-version: openjdk11 + mvn-version: "mvn38" + mvn-settings: "sdnc-oam-settings" + files: "**" + archive-artifacts: "" + sign-artifacts: true + build-node: centos8-docker-8c-8g + shallow-clone: true + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: sdnc-oam-java17 project-name: "sdnc-oam" jobs: - gerrit-maven-verify: @@ -27,13 +66,9 @@ stream: - "master": branch: "master" - java-version: openjdk17 - "london": branch: "london" - java-version: openjdk17 - - "kohn": - branch: "kohn" - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-oam-settings" files: "**" -- cgit 1.2.3-korg