diff options
| author |   Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-07-21 13:22:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-07-21 13:22:19 +0000 |
| commit | e064bf757990e03a54b2106ca93d9f4ccd424831 (patch) | |
| tree | c9ce06cfc9fce97eeb0afc7d6e3ee43ceb538a88 | |
| parent | 6cd88df5afbb7226a67b7de518d83cde1cdb8eec (diff) | |
| parent | 2d4082b259896d89acbf1479a6c977cf09d0172f (diff) | |
Merge "prefetch maven"
| -rw-r--r-- | vagrant/basebuild/bootstrap.sh | 1 | ||||
| -rw-r--r-- | vagrant/lib/bootstrap-functions.sh | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/vagrant/basebuild/bootstrap.sh b/vagrant/basebuild/bootstrap.sh index 4aea50d65..87eb3860a 100644 --- a/vagrant/basebuild/bootstrap.sh +++ b/vagrant/basebuild/bootstrap.sh @@ -7,6 +7,7 @@ set -e . /vagrant/lib/bootstrap-functions.sh do_setup +do_mvn_install # record the bootstrap.sh checksum sha1sum $0 > /etc/bootstrap.sha diff --git a/vagrant/lib/bootstrap-functions.sh b/vagrant/lib/bootstrap-functions.sh index 84e659593..027c69d04 100644 --- a/vagrant/lib/bootstrap-functions.sh +++ b/vagrant/lib/bootstrap-functions.sh @@ -5,14 +5,12 @@ do_setup() { } do_mvn_install() { - MAVEN_MIRROR=apache.mirrors.tds.net MAVEN_VERSION=3.3.9 - MAVEN_RELEASE=http://${MAVEN_MIRROR}/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz + MAVEN_FILENAME=apache-maven-${MAVEN_VERSION}-bin.tar.gz MAVEN_HOME=/opt/apache/maven - mkdir -p /opt/apache/maven - wget -O - ${MAVEN_RELEASE} | \ - tar xz -C ${MAVEN_HOME} --strip-components 1 + mkdir -p ${MAVEN_HOME} + tar -C ${MAVEN_HOME} --strip-components 1 -xzf /vagrant/${MAVEN_FILENAME} } @@ -223,7 +221,7 @@ rh_install_pkgs() { OUTPUT=$(rpm -qa epel-release) if [ -z "$OUTPUT" ] then - yum install -q -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm + yum install -q -y /vagrant/epel-release-latest-7.noarch.rpm fi # Install components to build Ganglia modules |