From 1d91d245483477c5b1119723cbba789d863f2c6b Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Mon, 16 May 2016 16:35:34 -0700
Subject: [PATCH] Allow per-environment ginkgo flags to be passed to the node
 e2e tests so that we can selectively disable slow tests in the PR builder
 when needed.

---
 hack/verify-flags/known-flags.txt             | 1 +
 test/e2e_node/e2e_remote.go                   | 3 ++-
 test/e2e_node/jenkins/e2e-node-jenkins.sh     | 2 +-
 test/e2e_node/jenkins/jenkins-ci.properties   | 1 +
 test/e2e_node/jenkins/jenkins-pull.properties | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hack/verify-flags/known-flags.txt b/hack/verify-flags/known-flags.txt
index 1591f9e758..2a2a16f277 100644
--- a/hack/verify-flags/known-flags.txt
+++ b/hack/verify-flags/known-flags.txt
@@ -165,6 +165,7 @@ gather-resource-usage
 gce-project
 gce-service-account
 gce-zone
+ginkgo-flags
 gke-cluster
 go-header-file
 google-json-key
diff --git a/test/e2e_node/e2e_remote.go b/test/e2e_node/e2e_remote.go
index 118543db62..112f97bdce 100644
--- a/test/e2e_node/e2e_remote.go
+++ b/test/e2e_node/e2e_remote.go
@@ -35,6 +35,7 @@ var sshOptions = flag.String("ssh-options", "", "Commandline options passed to s
 var sshEnv = flag.String("ssh-env", "", "Use predefined ssh options for environment.  Options: gce")
 var testTimeoutSeconds = flag.Int("test-timeout", 45*60, "How long (in seconds) to wait for ginkgo tests to complete.")
 var resultsDir = flag.String("results-dir", "/tmp/", "Directory to scp test results to.")
+var ginkgoFlags = flag.String("ginkgo-flags", "", "Passed to ginkgo to specify additional flags such as --skip=.")
 
 var sshOptionsMap map[string]string
 
@@ -160,7 +161,7 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int) (
 	cmd = getSshCommand(" && ",
 		fmt.Sprintf("cd %s", tmp),
 		fmt.Sprintf("tar -xzvf ./%s", archiveName),
-		fmt.Sprintf("timeout -k 30s %ds ./e2e_node.test --logtostderr --v 2 --build-services=false --stop-services=%t --node-name=%s --report-dir=%s/results --junit-file-number=%d", *testTimeoutSeconds, cleanup, host, tmp, junitFileNumber),
+		fmt.Sprintf("timeout -k 30s %ds ./e2e_node.test --logtostderr --v 2 --build-services=false --stop-services=%t --node-name=%s --report-dir=%s/results --junit-file-number=%d %s", *testTimeoutSeconds, cleanup, host, tmp, junitFileNumber, *ginkgoFlags),
 	)
 	glog.Infof("Starting tests on %s", host)
 	output, err := RunSshCommand("ssh", host, "--", "sh", "-c", cmd)
diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh
index 5f32138560..573f683397 100755
--- a/test/e2e_node/jenkins/e2e-node-jenkins.sh
+++ b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -40,4 +40,4 @@ mkdir -p ${ARTIFACTS}
 go run test/e2e_node/runner/run_e2e.go  --logtostderr --vmodule=*=2 --ssh-env="gce" \
   --zone="$GCE_ZONE" --project="$GCE_PROJECT"  \
   --hosts="$GCE_HOSTS" --images="$GCE_IMAGES" --cleanup="$CLEANUP" \
-  --results-dir="$ARTIFACTS"
+  --results-dir="$ARTIFACTS" --ginkgo-flags="$GINKGO_FLAGS"
diff --git a/test/e2e_node/jenkins/jenkins-ci.properties b/test/e2e_node/jenkins/jenkins-ci.properties
index 4bcf7c2007..04b778b11e 100644
--- a/test/e2e_node/jenkins/jenkins-ci.properties
+++ b/test/e2e_node/jenkins/jenkins-ci.properties
@@ -8,3 +8,4 @@ GCE_ZONE=us-central1-f
 GCE_PROJECT=kubernetes-jenkins
 INSTALL_GODEP=true
 CLEANUP=true
+GINKGO_FLAGS=
diff --git a/test/e2e_node/jenkins/jenkins-pull.properties b/test/e2e_node/jenkins/jenkins-pull.properties
index f798c8f9c5..76d0afdf2b 100644
--- a/test/e2e_node/jenkins/jenkins-pull.properties
+++ b/test/e2e_node/jenkins/jenkins-pull.properties
@@ -8,3 +8,4 @@ GCE_ZONE=us-central1-f
 GCE_PROJECT=kubernetes-jenkins-pull
 INSTALL_GODEP=true
 CLEANUP=true
+GINKGO_FLAGS=