summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2017-03-06 15:37:39 -0500
committerAlexis de Talhouët <adetalhouet89@gmail.com>2017-03-07 15:52:48 +0000
commit07efe43f176692b5dff011c97520ed4ee04320fd (patch)
tree8ff55ec1c554ac15407722c6e905cb7a9256f2a7
parente5cd0e12039cee90a731a3def3d4b04878ad4f89 (diff)
Hard-code MSO gerrit url
env.GIT_NO_PROJECT is only used in Jenkins. Downstream user don't have knowledge of this variable, but are failing to build because of it. The gerrit url shouldn't be subject to change, hence hard-coding its value in a maven property. Change-Id: Ieed47a282636eafd0556242f56dc0b4d3596ea29 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
-rw-r--r--packages/docker/pom.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/docker/pom.xml b/packages/docker/pom.xml
index c3b566d5e1..6ca79b70f7 100644
--- a/packages/docker/pom.xml
+++ b/packages/docker/pom.xml
@@ -18,6 +18,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <!-- If the maven profile "docker" is specified the parameter -Dmso.git.url=<MsoGitRepo> must be provided
+ i.e: mvn clean install -P docker -Dmso.git.url=https://gerrit.openecomp.org/r-->
+ <mso.git.url>${env.GIT_NO_PROJECT}</mso.git.url>
</properties>
<build>
@@ -35,7 +38,7 @@
</goals>
<phase>initialize</phase>
<configuration>
- <connectionUrl>scm:git:${env.GIT_NO_PROJECT}/mso/chef-repo</connectionUrl>
+ <connectionUrl>scm:git:${mso.git.url}/mso/chef-repo</connectionUrl>
<checkoutDirectory>src/main/docker/docker-files/chef-configs/chef-repo</checkoutDirectory>
<scmVersion>master</scmVersion>
<scmVersionType>branch</scmVersionType>
@@ -50,7 +53,7 @@
</goals>
<phase>initialize</phase>
<configuration>
- <connectionUrl>scm:git:${env.GIT_NO_PROJECT}/mso/mso-config</connectionUrl>
+ <connectionUrl>scm:git:${mso.git.url}/mso/mso-config</connectionUrl>
<checkoutDirectory>src/main/docker/docker-files/chef-configs/mso-config</checkoutDirectory>
<scmVersion>master</scmVersion>
<scmVersionType>branch</scmVersionType>