Update sdc merge template and job

Change-Id: I26581ad38a63956a79a3364915a990392300b896
Signed-off-by: ig6133 <ig6133@intl.att.com>

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 5ddfe81..8e574a4 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1090,7 +1090,7 @@
     name: '{project-name}-{stream}-sdc-merge-java'
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'ubuntu1604-docker-8c-8g'
 
     properties:
       - infra-properties:
@@ -1125,16 +1125,12 @@
       - provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
-          mvn-profile: '{mvn-profile}'
 
       - docker-login
 
-      - maven-target:
+      - maven-docker-push-daily:
           maven-version: '{maven-version}'
-          # yamllint disable rule:line-length
-          goals: 'clean deploy'
-          # yamllint enable
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
+          mvn-settings: '{mvn-settings}'
+          pom: '{docker-pom}'
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: '{mvn-profile}'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 99f256b..715d5c1 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -6,6 +6,7 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-sdc-merge-java':
+          docker-pom: 'pom.xml'
           mvn-profile: 'docker'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'