From 30a5c771056016686014cbde0fac0232b50f6371 Mon Sep 17 00:00:00 2001 From: Anaël Closson Date: Thu, 16 Feb 2017 15:02:56 +0100 Subject: Using profile for docker image build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I858f4dc73a3d11932526d116e2f291fac08a684c Signed-off-by: Anaël Closson --- jjb/global-macros.yaml | 4 ++-- jjb/global-templates-java.yaml | 2 ++ jjb/mso/mso.yaml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'jjb') 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: -- cgit 1.2.3-korg