diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-16 14:13:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-16 14:13:21 +0000 |
| commit | 400e3a4a6d3258a8b0c1149d83bd5092358f43b1 (patch) | |
| tree | 2b6aa3561196ef009c43161f05fb0479d5f84393 /jjb | |
| parent | 52435d5ad7cfcfa335b77d2a0af774798c2bee4e (diff) | |
| parent | 30a5c771056016686014cbde0fac0232b50f6371 (diff) | |
Merge "Using profile for docker image build"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-macros.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/mso/mso.yaml | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 5815ccf53..b324534a0 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -26,7 +26,7 @@ - maven-target: maven-version: 'mvn33' pom: '{pom}' - goals: 'clean deploy -B' + goals: 'clean deploy -B -P ${mvn-profile}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -42,7 +42,7 @@ - maven-target: maven-version: 'mvn33' pom: '{pom}' - goals: 'clean deploy -B' + goals: 'clean deploy -B -P ${mvn-profile}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 32770f276..a5d4ab6d3 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -412,3 +412,5 @@ - maven-docker-push-daily: 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/mso/mso.yaml b/jjb/mso/mso.yaml index 060df18ff..2628fecb1 100644 --- a/jjb/mso/mso.yaml +++ b/jjb/mso/mso.yaml @@ -8,7 +8,8 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': - docker-pom: './packages/docker/pom.xml' + docker-pom: 'pom.xml' + mvn-profile: 'docker' project: 'mso' stream: |