From 0905dccb1cac3f9eb30995b5ea6c78eaa6733c51 Mon Sep 17 00:00:00 2001
From: Abhishek Chanda <abhishek.becs@gmail.com>
Date: Fri, 5 Feb 2016 13:48:27 -0800
Subject: [PATCH] Enable running rkt tests in travis

- Introduces a travis target in Makefile to update docker and
  install rkt
---
 .travis.yml              |  2 +-
 GNUmakefile              | 11 +++--------
 scripts/install_rkt.sh   | 11 +++++++++++
 scripts/update_docker.sh |  7 +++++++
 4 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100755 scripts/install_rkt.sh
 create mode 100755 scripts/update_docker.sh

diff --git a/.travis.yml b/.travis.yml
index 59038bceb..281d3ad52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ branches:
     - master
 
 install:
-  - make prepare_docker
+  - make travis
   - make bootstrap
 
 script:
diff --git a/GNUmakefile b/GNUmakefile
index 769a74c02..26fadfc83 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -72,13 +72,8 @@ bootstrap:
     go get $$tool; \
 	done
 
-prepare_docker:
-	sudo stop docker
-	sudo rm -rf /var/lib/docker
-	sudo rm -f `which docker`
-	sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-	echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
-	sudo apt-get update
-	sudo apt-get install docker-engine=$(DOCKER_VERSION)-0~$(shell lsb_release -cs) -y --force-yes
+travis:
+	@sh -c "'$(PWD)/scripts/update_docker.sh'"
+	@sh -c "'$(PWD)/scripts/install_rkt.sh'"
 
 .PHONY: all bin cov integ test vet web web-push test-nodep
diff --git a/scripts/install_rkt.sh b/scripts/install_rkt.sh
new file mode 100755
index 000000000..13209b12f
--- /dev/null
+++ b/scripts/install_rkt.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ex
+
+RKT_VERSION="v1.0.0"
+DEST_DIR="/usr/local/bin"
+
+wget https://github.com/coreos/rkt/releases/download/$RKT_VERSION/rkt-$RKT_VERSION.tar.gz
+tar xzvf rkt-$RKT_VERSION.tar.gz
+sudo cp rkt-$RKT_VERSION/rkt $DEST_DIR
+sudo cp rkt-$RKT_VERSION/*.aci $DEST_DIR
diff --git a/scripts/update_docker.sh b/scripts/update_docker.sh
new file mode 100755
index 000000000..29fec35ea
--- /dev/null
+++ b/scripts/update_docker.sh
@@ -0,0 +1,7 @@
+sudo stop docker
+sudo rm -rf /var/lib/docker
+sudo rm -f `which docker`
+sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
+echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list
+sudo apt-get update
+sudo apt-get install docker-engine=$(DOCKER_VERSION)-0~$(shell lsb_release -cs) -y --force-yes