Bump rkt version; simplify script

This commit is contained in:
Michael Schurter
2017-01-27 11:52:09 -08:00
parent afbf63152b
commit 917c48a8e5
3 changed files with 6 additions and 7 deletions

7
Vagrantfile vendored
View File

@@ -14,9 +14,10 @@ sudo apt-get update
# Install base dependencies
sudo apt-get install -y build-essential curl git-core mercurial bzr \
libpcre3-dev pkg-config zip default-jre qemu silversearcher-ag jq htop \
vim unzip liblxc1 lxc-dev tree \
gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \ # arm64
libc6-dev-i386 linux-libc-dev:i386 \ # i386
vim unzip tree \
liblxc1 lxc-dev lxc-templates \ # lxc
gcc-5-aarch64-linux-gnu binutils-aarch64-linux-gnu \ # arm64
libc6-dev-i386 linux-libc-dev:i386 \ # i386
gcc-5-arm-linux-gnueabi gcc-5-multilib-arm-linux-gnueabi binutils-arm-linux-gnueabi # arm
# Setup go, for development of Nomad

View File

@@ -2,8 +2,7 @@
set -ex
RKT_VERSION="v1.17.0"
RKT_SHA512="30fd15716e148afa34ed28e6d5d778226e5e9761e9df3eb98f397cb2a7f3e3fc78e3dad2b717eee4157afc58183778cb1872aa82f3d05cc2bc9fb41193e81a7f"
RKT_VERSION="v1.18.0"
CMD="cp"
if [ ! -v DEST_DIR ]; then
@@ -15,9 +14,7 @@ if [ ! -d "rkt-${RKT_VERSION}" ]; then
printf "rkt-%s/ doesn't exist\n" "${RKT_VERSION}"
if [ ! -f "rkt-${RKT_VERSION}.tar.gz" ]; then
printf "Fetching rkt-%s.tar.gz\n" "${RKT_VERSION}"
echo "$RKT_SHA512 rkt-${RKT_VERSION}.tar.gz" > rkt-$RKT_VERSION.tar.gz.sha512sum
wget https://github.com/coreos/rkt/releases/download/$RKT_VERSION/rkt-$RKT_VERSION.tar.gz
sha512sum --check rkt-$RKT_VERSION.tar.gz.sha512sum
tar xzvf rkt-$RKT_VERSION.tar.gz
fi
fi

View File

@@ -14,6 +14,7 @@ trap "rm -rf $TEMPDIR" EXIT HUP INT QUIT TERM
# Build the Nomad binary for the API tests
echo "--> Building nomad"
echo go build -i -tags "$GOTEST_TAGS" -o $TEMPDIR/nomad
go build -i -tags "$GOTEST_TAGS" -o $TEMPDIR/nomad || exit 1
# Run the tests