Move release jobs to docker node

[ci-management.git] / jjb / dcaegen2 / dcaegen2-services-pm-mapper.yaml

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
index 33da0ac..e81b37d 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,10 +6,8 @@
     stream:
       - 'master':
           branch: 'master'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
-      - 'dublin':
-          branch: 'dublin'
-          mvn-goals: 'clean install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-version'
+      - 'el-alto':
+          branch: 'el-alto'
     # apply to all jobs
     project: 'dcaegen2/services/pm-mapper'
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
@@ -20,18 +18,20 @@
     build-node: ubuntu1604-docker-8c-8g
     jobs:
       - '{project-name}-{stream}-verify-java':
-        mvn-goals: 'clean install'
+        mvn-goals: 'clean install docker:build'
       - '{project-name}-{stream}-merge-java':
         mvn-goals: 'clean deploy'
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-docker-8c-8g
           maven-versions-plugin: true
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
       - 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 install dockerfile:build dockerfile:tag@tag-version dockerfile:push@push-latest dockerfile:push@push-version'
+          mvn-goals: 'clean install docker:build docker:push'
 
 - project:
     name: dcaegen2-services-pm-mapper-sonar