From db5d24c6b4a4a1e2f3ba9c14a03f6e94a84b679b Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Wed, 1 Jul 2015 17:38:57 -0700
Subject: [PATCH 1/2] e2e: update namespace test to create/delete test
 namespaces in parallel

The namespace test is currently taking about 18 minutes because it
creates and deletes namespaces sequentially, and for various reasons it
takes at least 10 seconds for each namespace.

By parallelizing the creation and deletion of namespaces, this test now
takes about 2-3 minutes.
---
 test/e2e/namespace.go | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/test/e2e/namespace.go b/test/e2e/namespace.go
index b7d438c3751..903b20a7f84 100644
--- a/test/e2e/namespace.go
+++ b/test/e2e/namespace.go
@@ -24,6 +24,7 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util/wait"
 	"strings"
+	"sync"
 	"time"
 
 	. "github.com/onsi/ginkgo"
@@ -42,27 +43,44 @@ func countRemaining(c *client.Client, withName string) (int, error) {
 }
 
 func extinguish(c *client.Client, totalNS int, maxAllowedAfterDel int, maxSeconds int) {
-
 	var err error
 
+	By("Creating testing namespaces")
+	wg := &sync.WaitGroup{}
 	for n := 0; n < totalNS; n += 1 {
-		_, err = createTestingNS(fmt.Sprintf("nslifetest-%v", n), c)
-		Expect(err).NotTo(HaveOccurred())
+		wg.Add(1)
+		go func(n int) {
+			defer wg.Done()
+			defer GinkgoRecover()
+			_, err = createTestingNS(fmt.Sprintf("nslifetest-%v", n), c)
+			Expect(err).NotTo(HaveOccurred())
+		}(n)
 	}
+	wg.Wait()
 
+	By("Waiting 10 seconds")
 	//Wait 10 seconds, then SEND delete requests for all the namespaces.
 	time.Sleep(time.Duration(10 * time.Second))
+	By("Deleting namespaces")
 	nsList, err := c.Namespaces().List(labels.Everything(), fields.Everything())
 	Expect(err).NotTo(HaveOccurred())
+	var nsCount = 0
 	for _, item := range nsList.Items {
 		if strings.Contains(item.Name, "nslifetest") {
-			if err := c.Namespaces().Delete(item.Name); err != nil {
-				Failf("Failed deleting error ::: --- %v ", err)
-			}
+			wg.Add(1)
+			nsCount++
+			go func(nsName string) {
+				defer wg.Done()
+				defer GinkgoRecover()
+				Expect(c.Namespaces().Delete(nsName)).To(Succeed())
+				Logf("namespace : %v api call to delete is complete ", nsName)
+			}(item.Name)
 		}
-		Logf("namespace : %v api call to delete is complete ", item)
 	}
+	Expect(nsCount).To(Equal(totalNS))
+	wg.Wait()
 
+	By("Waiting for namespaces to vanish")
 	//Now POLL until all namespaces have been eradicated.
 	expectNoError(wait.Poll(2*time.Second, time.Duration(maxSeconds)*time.Second,
 		func() (bool, error) {

From 44f3c9e01e50698664fba20192229c3e880609ea Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Wed, 1 Jul 2015 17:38:57 -0700
Subject: [PATCH 2/2] Re-enable namespace test on the pull request Jenkins

---
 hack/jenkins/e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh
index a248eae8078..434aa3a29a3 100755
--- a/hack/jenkins/e2e.sh
+++ b/hack/jenkins/e2e.sh
@@ -153,7 +153,7 @@ case ${JOB_NAME} in
     : ${GINKGO_PARALLEL:="y"}
     # This list should match the list in kubernetes-e2e-gce-parallel. It
     # currently also excludes a slow namespace test.
-    : ${GINKGO_TEST_ARGS:="--ginkgo.skip=${GCE_DEFAULT_SKIP_TEST_REGEX}|${GCE_PARALLEL_SKIP_TEST_REGEX}|${GCE_PARALLEL_FLAKY_TEST_REGEX}|Namespaces\sDelete\s90\spercent\sof\s100\snamespace\sin\s150\sseconds"}
+    : ${GINKGO_TEST_ARGS:="--ginkgo.skip=${GCE_DEFAULT_SKIP_TEST_REGEX}|${GCE_PARALLEL_SKIP_TEST_REGEX}|${GCE_PARALLEL_FLAKY_TEST_REGEX}"}
     : ${KUBE_GCE_INSTANCE_PREFIX:="pull-e2e-${EXECUTOR_NUMBER}"}
     : ${KUBE_GCS_STAGING_PATH_SUFFIX:="-${EXECUTOR_NUMBER}"}
     : ${PROJECT:="kubernetes-jenkins-pull"}