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-northbound.yaml | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) (limited to 'jjb/sdnc/sdnc-northbound.yaml') 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" -- cgit 1.2.3-korg