From 5f75c6bc29b301ea8f0982387fff23f13dce2e08 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 11 Jan 2024 15:21:35 -0500 Subject: [PATCH] Restore daily builds for CCSDK and SDNC master branches CCSDK and SDNC needs to restore daily builds for its master branches to ensure that latest SNAPSHOT version is available during development. Issue-ID: CIMAN-445 Signed-off-by: Dan Timoney Change-Id: Ibdd2a18463ae3a393b7e08f176a6f4879dd7efbc --- jjb/ccsdk/apps.yaml | 49 +++++++++++++++++++++++++++++++++++++++---- jjb/ccsdk/ccsdk-oran.yaml | 43 ++++++++++++++++++++++++++++++++++--- jjb/ccsdk/cds.yaml | 46 +++++++++++++++++++++++++++++++++++++--- jjb/ccsdk/distribution.yaml | 46 ++++++++++++++++++++++++++++++++++++---- jjb/ccsdk/features.yaml | 42 +++++++++++++++++++++++++++++++++---- jjb/ccsdk/parent.yaml | 43 ++++++++++++++++++++++++++++++++----- jjb/ccsdk/sli.yaml | 40 ++++++++++++++++++++++++++++++++--- jjb/sdnc/sdnc-apps.yaml | 2 ++ jjb/sdnc/sdnc-northbound.yaml | 39 +++++++++++++++++++++++++++++++--- jjb/sdnc/sdnc-oam.yaml | 43 ++++++++++++++++++++++++++++++++++--- 10 files changed, 361 insertions(+), 32 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 0e3745003..4b5de2f8f 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -47,8 +47,8 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-apps - project-name: "ccsdk-apps-java17" + name: ccsdk-apps-released-java17 + project-name: "ccsdk-apps" jobs: - gerrit-maven-verify: mvn-params: "-Ddocker.skip.push=true -Pdocker" @@ -71,8 +71,6 @@ project: "ccsdk/apps" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -91,6 +89,49 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-apps-current-java17 + project-name: "ccsdk-apps" + jobs: + - gerrit-maven-verify: + 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: + cron: "@daily" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/apps" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-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: "" + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-apps-sonar jobs: diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index d88974d34..4f949f456 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -38,7 +38,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-oran-java17 + name: ccsdk-oran-released-java17 project-name: "ccsdk-oran" jobs: - gerrit-maven-verify: @@ -62,8 +62,6 @@ build-node: centos7-docker-2c-1g project: "ccsdk/oran" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -79,6 +77,45 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-oran-current-java17 + project-name: "ccsdk-oran" + 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" + mvn-opts: "-Ddocker.skip=true" + cron: "@daily" + 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 -Pdocker" + maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + project: "ccsdk/oran" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-oran-settings" + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + mvn-profile: docker + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-oran-clm jobs: diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 0758e8a1e..37fdd144b 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -40,7 +40,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-cds-java17 + name: ccsdk-cds-released-java17 project-name: "ccsdk-cds" jobs: - gerrit-maven-verify: @@ -63,8 +63,6 @@ project: "ccsdk/cds" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -83,6 +81,48 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-cds-current-java17 + project-name: "ccsdk-cds" + jobs: + - gerrit-maven-verify: + 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: + cron: "@daily" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/cds" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-cds-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: "" + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-cds-sonar jobs: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 5475bfae7..478e61d99 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -39,7 +39,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-distribution-java17 + name: ccsdk-distribution-released-java17 project-name: "ccsdk-distribution" jobs: - gerrit-maven-verify: @@ -64,9 +64,6 @@ project: "ccsdk/distribution" stream: - - "master": - branch: "master" - java-version: openjdk17 - "montreal": branch: "montreal" java-version: openjdk17 @@ -83,6 +80,47 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-distribution-current-java17 + project-name: "ccsdk-distribution" + 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" + maven-versions-plugin: true + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: + cron: "@daily" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/distribution" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-distribution-settings" + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + mvn-profile: docker + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-distribution-clm jobs: diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index c3ed60f6a..3847cecdf 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -36,7 +36,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-features-java17 + name: ccsdk-features-released-java17 project-name: "ccsdk-features" jobs: - gerrit-maven-verify: @@ -54,9 +54,6 @@ project: "ccsdk/features" stream: - - "master": - branch: "master" - mvn-opts: "-Xmx3072m" - "montreal": branch: "montreal" mvn-opts: "-Xmx3072m" @@ -77,6 +74,43 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-features-current-java17 + project-name: "ccsdk-features" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/features" + stream: + - "master": + branch: "master" + mvn-opts: "-Xmx3072m" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-features-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: "" + build-node: centos8-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-features-sonar jobs: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 095772f1a..74d71c25d 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -34,7 +34,7 @@ archive-artifacts: "" - project: - name: ccsdk-parent-java17 + name: ccsdk-parent-released-java17 project-name: "ccsdk-parent" jobs: - gerrit-maven-verify: @@ -50,6 +50,43 @@ - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + project: "ccsdk/parent" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-parent-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: "" + +- project: + name: ccsdk-parent-current-java17 + project-name: "ccsdk-parent" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" project: "ccsdk/parent" @@ -65,10 +102,6 @@ mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0" - "{project-name}-gerrit-release-jobs": mvn-params: "-Drevision=3.0.0" - - "montreal": - branch: "montreal" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-parent-settings" diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index cb9f2a291..f047f101d 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -35,7 +35,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-sli-java17 + name: ccsdk-sli-released-java17 project-name: "ccsdk-sli" jobs: - gerrit-maven-verify: @@ -53,8 +53,6 @@ project: "ccsdk/sli" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -73,6 +71,42 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: ccsdk-sli-current-java17 + project-name: "ccsdk-sli-current" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/sli" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-sli-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: "" + build-node: centos8-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + - project: name: ccsdk-sli-sonar jobs: diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 6187f82d7..03380e9a4 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -65,6 +65,7 @@ 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 @@ -73,6 +74,7 @@ cron: "" sbom-generator: true - gerrit-maven-docker-stage: + cron: "@daily" build-node: ubuntu1804-docker-8c-8g container-public-registry: "nexus3.onap.org:10001" container-staging-registry: "nexus3.onap.org:10003" diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 850c63aa5..0b8c14d3c 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -34,7 +34,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-northbound-java17 + name: sdnc-northbound-released-java17 project-name: "sdnc-northbound" jobs: - gerrit-maven-verify @@ -49,8 +49,6 @@ project: "sdnc/northbound" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -71,6 +69,41 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: sdnc-northbound-current-java17 + 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: + - "master": + branch: "master" + java-version: openjdk17 + 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-sonar jobs: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index b3279a328..cbf4864eb 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -37,7 +37,7 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-oam-java17 + name: sdnc-oam-released-java17 project-name: "sdnc-oam" jobs: - gerrit-maven-verify: @@ -60,8 +60,6 @@ build-node: centos7-docker-2c-1g project: "sdnc/oam" stream: - - "master": - branch: "master" - "montreal": branch: "montreal" - "london": @@ -77,6 +75,45 @@ mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" +- project: + name: sdnc-oam-current-java17 + 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: + cron: "@daily" + 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 + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + project: "sdnc/oam" + stream: + - "master": + branch: "master" + java-version: openjdk17 + 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-clm jobs: -- 2.16.6