From 1234ed696c17dfcc810fd472c4a566398dba644d Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 16 Jul 2019 12:50:19 -0700 Subject: Migrate gerrit-maven-stage (DCAEGEN)-4 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: I9145dfdd2852a107f3120910002d75dd05a98ac6 Issue-ID: CIMAN-234 Signed-off-by: Jessica Wagantall --- .../dcaegen2-services-bbs-eventprocessor-java.yaml | 34 ++++++++++++++++++++-- .../dcaegen2-services-datalake-handler.yaml | 32 ++++++++++++++++++-- 2 files changed, 62 insertions(+), 4 deletions(-) (limited to 'jjb/dcaegen2') diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 2e49ee55a..78f758fe1 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -6,8 +6,6 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily': - version-properties: 'components/bbs-event-processor/version.properties' subproject: - 'bbs-event-processor': pom: 'components/bbs-event-processor/pom.xml' @@ -24,6 +22,38 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-services-bbs-event-processor-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + version-properties-file: 'components/bbs-event-processor/version.properties' + mvn-pom: 'components/bbs-event-processor/pom.xml' + mvn-params: '-f components/bbs-event-processor/pom.xml' + pattern: 'components/bbs-event-processor/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package docker:build -DpushImage -f components/bbs-event-processor/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/bbs-event-processor/**' + + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + - project: name: dcaegen2-services-bbs-event-processor-sonar jobs: diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 1c5ad804f..9fce045a3 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -6,8 +6,6 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily': - version-properties: 'components/datalake-handler/version.properties' subproject: - 'datalake-handler': pom: 'components/datalake-handler/pom.xml' @@ -22,6 +20,36 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' +- project: + name: dcaegen2-services-datalake-handler-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'components/datalake-handler/pom.xml' + mvn-params: '-f components/datalake-handler/pom.xml' + version-properties-file: 'components/datalake-handler/version.properties' + pattern: 'components/datalake-handler/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' + + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + - project: name: dcaegen2-services-datalake-handler-sonar jobs: -- cgit 1.2.3-korg