SDC job modifications

Add SDC merge template with mvn-profile
Modified SDC jobs to use updated templates

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

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c48b145..5ddfe81 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1078,3 +1078,63 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
+
+- job-template:
+    # Job template for Java merge jobs
+    #
+    # The purpose of this job template is to run "maven clean deploy" for
+    # projects using this template.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    name: '{project-name}-{stream}-sdc-merge-java'
+
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+          mvn-profile: '{mvn-profile}'
+
+      - docker-login
+
+      - maven-target:
+          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

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index a177bff..99f256b 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -5,10 +5,11 @@
     project-name: 'sdc'
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
+      - '{project-name}-{stream}-sdc-merge-java':
           mvn-profile: 'docker'
+      - '{project-name}-{stream}-docker-version-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker,docker-staging'
     project: 'sdc'
     stream:
       - 'master':