From cd4818ef7f8fdd30c294f8f93f2d85082ec9dbea Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 11 Jul 2019 15:44:34 -0700 Subject: Migrate gerrit-maven-stage (DCAEGEN)-3 Migrate to use gerrit-maven-stage from global-jjb to allow the generation of signed release artifacts that will reduce release processing time. Do not sign artifacts in maven-docker-stage as there are no jars being process in these jobs. Change-Id: I0f5d5c253df9fb48db0a1a2dd5d05ae8b36025b5 Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 8 ++++---- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 5 ++++- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 5 ++++- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 5 ++++- jjb/dcaegen2/dcaegen2-services-mapper.yaml | 14 +++++++++----- jjb/dcaegen2/dcaegen2-services-prh.yaml | 5 ++++- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 5 ++++- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 6d0d2dcb4..778324c51 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -18,11 +18,11 @@ - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': mvn-goals: 'clean install' - - '{project-name}-{stream}-docker-java-shell-daily': + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean deploy docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' - project: name: dcaegen2-analytics-tca-gen2-sonar diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 7f065240c..861d57124 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -17,7 +17,10 @@ archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g jobs: - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' - '{project-name}-{stream}-merge-java': diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 1be57266b..08b3dfb5d 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index d7bc96472..2c2f6464e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/collectors/ves' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index e319e68a6..8e6db3508 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -5,12 +5,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-shell-daily': + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g mvn-goals: 'clean package docker:build -DpushImage' - # No-op - script: '/bin/true' - build-node: 'ubuntu1604-docker-8c-8g' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + project: 'dcaegen2/services/mapper' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 8e3047f7e..7cb2d03e9 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/services/prh' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index b4d2b5c5b..3318b48b0 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -5,7 +5,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'dcaegen2/services/son-handler' stream: -- cgit 1.2.3-korg