From 1b137e434456986887b4d457ae62384beec882ec Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Mon, 11 Jul 2016 15:10:09 -0600
Subject: [PATCH 1/2] Skipping travis tests and not installing rkt on travis

---
 GNUmakefile               |  1 -
 client/driver/rkt_test.go | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index c1ae29a15..72fd267b2 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -77,6 +77,5 @@ install: bin/nomad
 travis:
 	@sudo apt-get install -y qemu
 	@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/client/driver/rkt_test.go b/client/driver/rkt_test.go
index 0c5c08850..bc410695c 100644
--- a/client/driver/rkt_test.go
+++ b/client/driver/rkt_test.go
@@ -18,6 +18,8 @@ import (
 )
 
 func TestRktVersionRegex(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	input_rkt := "rkt version 0.8.1"
 	input_appc := "appc version 1.2.0"
 	expected_rkt := "0.8.1"
@@ -34,6 +36,8 @@ func TestRktVersionRegex(t *testing.T) {
 
 // The fingerprinter test should always pass, even if rkt is not installed.
 func TestRktDriver_Fingerprint(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 	driverCtx, _ := testDriverContexts(&structs.Task{Name: "foo"})
 	d := NewRktDriver(driverCtx)
@@ -59,6 +63,8 @@ func TestRktDriver_Fingerprint(t *testing.T) {
 }
 
 func TestRktDriver_Start_DNS(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 	// TODO: use test server to load from a fixture
 	task := &structs.Task{
@@ -105,6 +111,8 @@ func TestRktDriver_Start_DNS(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{
 		Name: "etcd",
@@ -154,6 +162,8 @@ func TestRktDriver_Start_Wait(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{
 		Name: "etcd",
@@ -202,6 +212,8 @@ func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 
 	exp := []byte{'w', 'i', 'n'}
@@ -262,6 +274,8 @@ func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
 }
 
 func TestRktDriverUser(t *testing.T) {
+	t.Skip("skipping rkt tests")
+
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{
 		Name: "etcd",

From cab0d3eea7a89d5feca845c7030fd1af86c9c6e0 Mon Sep 17 00:00:00 2001
From: Diptanu Choudhury <diptanuc@gmail.com>
Date: Mon, 11 Jul 2016 15:46:45 -0600
Subject: [PATCH 2/2] Introduced an env var for rkt tests

---
 client/driver/rkt_test.go | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/client/driver/rkt_test.go b/client/driver/rkt_test.go
index bc410695c..5a4c84dbc 100644
--- a/client/driver/rkt_test.go
+++ b/client/driver/rkt_test.go
@@ -3,6 +3,7 @@ package driver
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -18,7 +19,9 @@ import (
 )
 
 func TestRktVersionRegex(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	input_rkt := "rkt version 0.8.1"
 	input_appc := "appc version 1.2.0"
@@ -36,7 +39,9 @@ func TestRktVersionRegex(t *testing.T) {
 
 // The fingerprinter test should always pass, even if rkt is not installed.
 func TestRktDriver_Fingerprint(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 	driverCtx, _ := testDriverContexts(&structs.Task{Name: "foo"})
@@ -63,7 +68,9 @@ func TestRktDriver_Fingerprint(t *testing.T) {
 }
 
 func TestRktDriver_Start_DNS(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 	// TODO: use test server to load from a fixture
@@ -111,7 +118,9 @@ func TestRktDriver_Start_DNS(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{
@@ -162,7 +171,9 @@ func TestRktDriver_Start_Wait(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{
@@ -212,7 +223,9 @@ func TestRktDriver_Start_Wait_Skip_Trust(t *testing.T) {
 }
 
 func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 
@@ -274,7 +287,9 @@ func TestRktDriver_Start_Wait_AllocDir(t *testing.T) {
 }
 
 func TestRktDriverUser(t *testing.T) {
-	t.Skip("skipping rkt tests")
+	if os.Getenv("NOMAD_TEST_RKT") == "" {
+		t.Skip("skipping rkt tests")
+	}
 
 	ctestutils.RktCompatible(t)
 	task := &structs.Task{