diff options
| author |   C.J. Collier <cjcollier@linuxfoundation.org> | 2016-07-21 08:15:48 -0700 |
|---|---|---|
| committer | C.J. Collier <cjcollier@linuxfoundation.org> | 2016-07-21 08:26:33 -0700 |
| commit | 0c5de29b8355e3e0ec73080f57f290e25a52fcfc (patch) | |
| tree | d1f94b626a96a714d4b3a65e0b3f94a3917d3e95 | |
| parent | e064bf757990e03a54b2106ca93d9f4ccd424831 (diff) | |
Use maven from /opt
Change-Id: I6173e24be1efbabf9b9507af593210803f8fff21
Signed-off-by: C.J. Collier <cjcollier@linuxfoundation.org>
| -rw-r--r-- | jjb/scripts/maven_push_functions.sh | 8 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-maven-push.sh | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh index ad6248cf7..45428e292 100644 --- a/jjb/scripts/maven_push_functions.sh +++ b/jjb/scripts/maven_push_functions.sh @@ -5,13 +5,7 @@ echo "* STARTING PUSH OF PACKAGES TO REPOS" echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE" echo "*******************************************************************" -# Determine the path to maven -if [ -z "${MAVEN_SELECTOR}" ]; then - echo "ERROR: No Maven install detected!" - exit 1 -fi - -MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/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 91bc295b8..0e9c33420 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/vpp/include-raw-vpp-maven-push.sh @@ -5,13 +5,7 @@ echo "* STARTING PUSH OF PACKAGES TO REPOS" echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE" echo "*******************************************************************" -# Determine the path to maven -if [ -z "${MAVEN_SELECTOR}" ]; then - echo "ERROR: No Maven install detected!" - exit 1 -fi - -MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/mvn" +MVN="/opt/apache/maven/bin/mvn" GROUP_ID="io.fd.${PROJECT}" BASEURL="${NEXUSPROXY}/content/repositories/fd.io." BASEREPOID='fdio-' |