diff options
author | ig6133 <ig6133@intl.att.com> | 2017-04-03 17:47:19 +0300 |
---|---|---|
committer | ig6133 <ig6133@intl.att.com> | 2017-04-03 17:47:35 +0300 |
commit | 9fdb9d28d8e332a90b8cbaa3a19c3262b141a51d (patch) | |
tree | e052c32559d2cdc166f6400cf6e51e1a1c4afd38 | |
parent | fe8dc1767df1f333241c079b444fdd4caa8fcd81 (diff) |
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>
-rw-r--r-- | jjb/global-templates-java.yaml | 60 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 7 |
2 files changed, 64 insertions, 3 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index c48b14581..5ddfe81c7 100644 --- 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 a177bff3d..99f256bc5 100644 --- 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': |