From de3297de1432c45b30e7dd676e387ef20613896f Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 16 Jun 2021 23:03:29 -0400 Subject: [PATCH] Adding honolulu review verification jobs Skipping maven tests run during stage or merge Adding -Pdocker in verify with docker.skip.push true Issue-ID: CIMAN-405 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I84c2e5b6ca5cfdee3f93d21ab9f053fa18fdaf56 --- jjb/ccsdk/apps.yaml | 7 +++++-- jjb/ccsdk/ccsdk-csit.yaml | 10 ++++++---- jjb/ccsdk/ccsdk-oran.yaml | 7 +++++-- jjb/ccsdk/cds.yaml | 6 +++--- jjb/ccsdk/distribution.yaml | 7 +++++-- jjb/ccsdk/features.yaml | 5 ++++- jjb/ccsdk/parent.yaml | 5 ++++- jjb/ccsdk/sli.yaml | 5 ++++- jjb/ccsdk/utils.yaml | 5 ++++- jjb/sdnc/sdnc-apps.yaml | 9 ++++++--- jjb/sdnc/sdnc-csit.yaml | 6 ++++-- jjb/sdnc/sdnc-oam.yaml | 10 ++++++---- 12 files changed, 56 insertions(+), 26 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8b267fd24..3ab4b730b 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -9,18 +9,21 @@ name: ccsdk-apps project-name: 'ccsdk-apps' jobs: - - gerrit-maven-verify + - 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: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 80ec2bda7..911e144c0 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -3,10 +3,10 @@ name: ccsdk-distribution-csit jobs: - '{project-name}-review-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' maven-versions-plugin: true - '{project-name}-merge-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' maven-versions-plugin: true project-name: 'ccsdk-distribution' recipients: 'dtimoney@att.com' @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'ccsdk-distribution-settings' robot-options: '' branch: 'master' @@ -23,9 +25,9 @@ name: ccsdk-oran-csit jobs: - '{project-name}-review-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' - '{project-name}-merge-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' project-name: 'ccsdk-oran' recipients: 'bjorn.magnusson@est.tech martin.c.yan@est.tech' # project name in gerrit diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 863dedf77..0702230d7 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -3,19 +3,22 @@ name: ccsdk-oran project-name: 'ccsdk-oran' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' mvn-opts: '-Ddocker.skip=true' cron: '' - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index becb461f3..dcfa21868 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -4,10 +4,10 @@ project-name: 'ccsdk-cds' jobs: - gerrit-maven-verify: - mvn-params: '-Ddocker.skip.push=true -P docker' + mvn-params: '-Ddocker.skip.push=true -Pdocker' - gerrit-maven-merge: cron: '@daily' - mvn-params: '-Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true @@ -16,7 +16,7 @@ - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index a071890a6..73d85b037 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,19 +3,22 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' maven-versions-plugin: true cron: '' - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index dafafb35e..9b6544f71 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -3,12 +3,15 @@ name: ccsdk-features project-name: 'ccsdk-features' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index b9de56d01..80f4cf262 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -3,12 +3,15 @@ name: ccsdk-parent project-name: 'ccsdk-parent' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 299a415b7..77cf7beb8 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -3,12 +3,15 @@ name: ccsdk-sli project-name: 'ccsdk-sli' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 52ab57ddc..25061980c 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,12 +3,15 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: build-node: centos7-builder-4c-4g sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 4e5b1c201..43ad1c29b 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -9,18 +9,21 @@ name: sdnc-apps project-name: 'sdnc-apps' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + mvn-params: '-Ddocker.skip.push=true -Pdocker' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - sign-artifacts: true build-node: centos7-builder-4c-4g + sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 71f7180fd..0ce45c359 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -3,10 +3,10 @@ name: sdnc-oam-csit jobs: - '{project-name}-review-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' maven-versions-plugin: true - '{project-name}-merge-verification-maven-{stream}': - mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -P docker' + mvn-params: '-Dmaven.test.skip=true -Ddocker.skip.push=true -Pdocker' maven-versions-plugin: true project-name: 'sdnc-oam' recipients: 'dtimoney@att.com' @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'honolulu': + branch: 'honolulu' mvn-settings: 'sdnc-oam-settings' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 7380359f0..c04202f0f 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -4,19 +4,21 @@ name: sdnc-oam project-name: 'sdnc-oam' jobs: - - gerrit-maven-verify + - gerrit-maven-verify: + cron: '' - gerrit-maven-merge: cron: '@daily' + mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - sign-artifacts: true build-node: centos7-builder-4c-4g - maven-versions-plugin: true + sign-artifacts: true + mvn-params: '-Dmaven.test.skip=true' cron: '' - 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 -P docker' + mvn-params: '-Dmaven.test.skip=true -Pdocker' maven-version: "mvn35" maven-versions-plugin: true cron: '@daily' -- 2.16.6