diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2017-02-15 11:12:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-15 11:12:17 +0000 |
| commit | 1ba46ee831e096bf7a31bf2248456e2089847812 (patch) | |
| tree | 486f19022c9076cee2311e7f9fd3f5d7a90ef853 | |
| parent | e0a53ddb2bf72e95e1300208001b7649cd14f977 (diff) | |
| parent | 9dfecca17cc550e6a542440d89dd8705d0cc102c (diff) | |
Merge "Removing profile option from docker jobs"
| -rw-r--r-- | jjb/global-macros.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/mso/mso.yaml | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index d8ced3498..43f52f46c 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 -P {profile-name} -B' + goals: 'clean deploy -B' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -42,7 +42,7 @@ - maven-target: maven-version: 'mvn33' pom: '{pom}' - goals: 'clean deploy -P {profile-name} -B' + goals: 'clean deploy -B' 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 8499e61b3..ff5f25ec5 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -338,6 +338,5 @@ settings-file: '{mvn-settings}' - maven-docker-push-daily: - profile-name: '{profile-name}' mvn-settings: '{mvn-settings}' pom: '{docker-pom}' diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml index 0c176561a..060df18ff 100644 --- a/jjb/mso/mso.yaml +++ b/jjb/mso/mso.yaml @@ -9,7 +9,6 @@ - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: './packages/docker/pom.xml' - profile-name: 'docker' project: 'mso' stream: |