From 484d8c892df57e7f29616e1632a447e12e64edd1 Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Sun, 21 Jul 2019 04:57:59 +0000 Subject: Fix gerrit-mvn job errors Change-Id: Iab852b4ade5d2a711c38779c5c4b2eee026e9dd1 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-1578 --- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 1 + jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 5 +++++ jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-prh.yaml | 6 +++++- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 3 +-- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 5 +++++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index f8dd9e0f4..7f962a99a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -28,6 +28,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + mvn-goals: 'clean install docker:build docker:push' - project: name: dcaegen2-collectors-hv-ves-clm diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index a1237cee9..3a5249c3c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -9,6 +9,11 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImage' project: 'dcaegen2/collectors/restconf' stream: diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 3dfb53702..38741e150 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -27,7 +27,7 @@ jobs: - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos7-docker-8c-8g maven-versions-plugin: true version-properties-file: 'components/bbs-event-processor/version.properties' mvn-pom: 'components/bbs-event-processor/pom.xml' @@ -35,7 +35,7 @@ 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' + mvn-goals: 'clean package 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/**' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 1d4afc403..f5f9eddce 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -9,7 +9,11 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true - + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImage' project: 'dcaegen2/services/prh' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index f191fbc25..153562b82 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -6,8 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: ubuntu1604-docker-8c-8g maven-versions-plugin: true project: 'dcaegen2/services/sdk' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 3c80e05de..a2c56f032 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -9,6 +9,11 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-goals: 'clean package docker:build -DpushImage' project: 'dcaegen2/services/son-handler' stream: -- cgit 1.2.3-korg