From 4a85064ed8c629a4d7743f0f0eb8fc72a4e2f6cf Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 27 May 2021 12:22:43 +1000 Subject: CI: Update dcaegen2 jobs to use mvn35 Issue-ID: CIMAN-33 LF-JIRA: IT-22152 Change-Id: Icc85b59126d537db4795ae4d74e7a9612f07b9a4 Signed-off-by: Anil Belur --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 38 +++++++++++++++------------ 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml') diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 91fdaa5b2..4fbd716e8 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -1,6 +1,23 @@ --- - project: name: dcaegen2-analytics-tca-gen2 + # apply to all jobs + jobs: + - '{project-name}-{stream}-verify-java': + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean install' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + mvn-goals: 'clean deploy docker:build -DpushImage' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + project: 'dcaegen2/analytics/tca-gen2' # job template iterators project-name: 'dcaegen2-analytics-tca-gen2' stream: @@ -11,30 +28,15 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 - # apply to all jobs - project: 'dcaegen2/analytics/tca-gen2' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-version: 'mvn35' + maven-version: 'mvn35' files: '**' maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' build-node: ubuntu1804-docker-8c-8g - jobs: - - '{project-name}-{stream}-verify-java': - - '{project-name}-{stream}-merge-java': - mvn-goals: 'clean install' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-goals: 'clean deploy docker:build -DpushImage' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true + - project: name: dcaegen2-analytics-tca-gen2-sonar java-version: openjdk11 @@ -54,6 +56,7 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' mvn-version: 'mvn35' + maven-version: 'mvn35' - project: name: dcaegen2-analytics-tca-gen2-clm @@ -67,6 +70,7 @@ branch: 'master' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-version: 'mvn35' + maven-version: 'mvn35' - project: name: dcaegen2-analytics-tca-gen2-info -- cgit 1.2.3-korg