From 917c48a8e5fe1fb6381453ddc671c78ea1c69dc0 Mon Sep 17 00:00:00 2001
From: Michael Schurter <schmichael@hashicorp.com>
Date: Fri, 27 Jan 2017 11:52:09 -0800
Subject: [PATCH] Bump rkt version; simplify script

---
 Vagrantfile            | 7 ++++---
 scripts/install_rkt.sh | 5 +----
 scripts/test.sh        | 1 +
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index c1f8a20c9..513ab3335 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -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
diff --git a/scripts/install_rkt.sh b/scripts/install_rkt.sh
index 22df0a5cf..856ff3a3d 100755
--- a/scripts/install_rkt.sh
+++ b/scripts/install_rkt.sh
@@ -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
diff --git a/scripts/test.sh b/scripts/test.sh
index bc163dd6b..467d73b38 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -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