diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-04-05 13:33:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-04-05 13:33:03 +0000 |
| commit | 7900e61be6d3518c99962d7c23ed3bf480908d6f (patch) | |
| tree | 5444b745fbc410bca5424ff61a63a222596f276f /jjb | |
| parent | 342a4db028aa8acdd259bc600d255080bf91c6b2 (diff) | |
| parent | cb3f8233976f1bd80ed61749b2704b07158a2724 (diff) | |
Merge "Update sdc merge template and job"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-java.yaml | 14 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 1 |
2 files changed, 6 insertions, 9 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 7c7026023..8e574a4db 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -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 99f256bc5..715d5c1e7 100644 --- 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' |