From fbf001d52b54969adca238487fe739471ec50e9e Mon Sep 17 00:00:00 2001 From: Stavros Kanarakis Date: Mon, 30 Mar 2020 17:58:37 +0300 Subject: Use new JJB global templates for merge in BBS-ep Change-Id: I100429e0ee47885253636c7fef7ce5b4362ff1aa Issue-ID: DCAEGEN2-2105 Signed-off-by: Stavros Kanarakis --- .../dcaegen2-services-bbs-eventprocessor-java.yaml | 26 ++++++++++++++++++---- 1 file changed, 22 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 eec174ab5..2fc095186 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -1,12 +1,10 @@ --- - project: - name: dcaegen2-services-bbs-event-processor + name: dcaegen2-services-bbs-event-processor-verify project: 'dcaegen2/services' project-name: 'dcaegen2-services' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java': - mvn-goals: 'clean install' subproject: - 'bbs-event-processor': pom: 'components/bbs-event-processor/pom.xml' @@ -23,6 +21,26 @@ archive-artifacts: '' build-node: 'ubuntu1804-docker-8c-8g' +- project: + name: dcaegen2-services-bbs-event-processor-merge + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor' + jobs: + - gerrit-maven-merge: + mvn-params: '-f components/bbs-event-processor/pom.xml' + mvn-goals: 'clean install -Dmaven.deploy.skip=true' + branch: 'master' + java-version: openjdk11 + mvn-settings: 'dcaegen2-services-settings' + maven-version: 'mvn35' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1804-docker-8c-8g' + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + - project: name: dcaegen2-services-bbs-event-processor-release project: 'dcaegen2/services' @@ -39,7 +57,7 @@ pattern: 'components/bbs-event-processor/**' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/bbs-event-processor/pom.xml' + mvn-goals: 'clean package -Dmaven.deploy.skip=true dockerfile:build dockerfile:push -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/**' -- cgit 1.2.3-korg