diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-10-24 12:52:40 -0700 |
|---|---|---|
| committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-10-24 12:52:40 -0700 |
| commit | 0b2640d588cc6ff205bb94036cbc3fcb4b604aa0 (patch) | |
| tree | d64534a22630bc7431ef1e4e10f985bf24b8440e /jjb | |
| parent | 7033cb8235cc8ab08239c6a5fda216dee659655c (diff) | |
Don't forcibly hardcode maven location
It's bad form to hard code the path to maven in any of the build
scripts. Doing so makes it difficult to switch back to using the
dynamically installed maven system which makes the builds more flexible.
Change-Id: Ide4e595c9e9f561bb404c2491e528b3129e2ecca
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/scripts/maven_push_functions.sh | 2 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-maven-push.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh index 5687a562e..564c6ef37 100644 --- a/jjb/scripts/maven_push_functions.sh +++ b/jjb/scripts/maven_push_functions.sh @@ -5,7 +5,7 @@ echo "* STARTING PUSH OF PACKAGES TO REPOS" echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE" echo "*******************************************************************" -MVN="/opt/apache/maven/bin/mvn" +[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" GROUP_ID="io.fd.${PROJECT}" BASEURL="${NEXUSPROXY}/content/repositories/fd.io." BASEREPOID='fdio-' diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh index 24bd5c776..0d476b581 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/vpp/include-raw-vpp-maven-push.sh @@ -5,7 +5,7 @@ echo "* STARTING PUSH OF PACKAGES TO REPOS" echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE" echo "*******************************************************************" -MVN="/opt/apache/maven/bin/mvn" +[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" GROUP_ID="io.fd.${PROJECT}" BASEURL="${NEXUSPROXY}/content/repositories/fd.io." BASEREPOID='fdio-' |