Merge pull request openshift#16678 from jim-minter/tsb_tests_wait_ser…

…viceacct Automatic merge from submit-queue (batch tested with PRs 16675, 16678). wait for builder service account on necessary templateinstance/tsb tests fixes openshift#16676 (all being well)
mux03 · Oct 5, 2017 · 4650d1d · 4650d1d
2 parents d8ecd70 + 5ccc860
commit 4650d1d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/test/extended/templates/templateinstance_readiness.go b/test/extended/templates/templateinstance_readiness.go
@@ -97,7 +97,10 @@ var _ = g.Describe("[Conformance][templates] templateinstance readiness test", f
 	}
 
 	g.BeforeEach(func() {
-		err := cli.Run("create").Args("-f", templatefixture).Execute()
+		err := exutil.WaitForBuilderAccount(cli.KubeClient().Core().ServiceAccounts(cli.Namespace()))
+		o.Expect(err).NotTo(o.HaveOccurred())
+
+		err = cli.Run("create").Args("-f", templatefixture).Execute()
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		template, err = cli.TemplateClient().Template().Templates(cli.Namespace()).Get("cakephp-mysql-example", metav1.GetOptions{})

diff --git a/test/extended/templates/templateservicebroker_e2e.go b/test/extended/templates/templateservicebroker_e2e.go
@@ -51,10 +51,12 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te
 	g.BeforeEach(func() {
 		framework.SkipIfProviderIs("gce")
 
+		err := exutil.WaitForBuilderAccount(cli.KubeClient().Core().ServiceAccounts(cli.Namespace()))
+		o.Expect(err).NotTo(o.HaveOccurred())
+
 		brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
 
 		cliUser = &user.DefaultInfo{Name: cli.Username(), Groups: []string{"system:authenticated"}}
-		var err error
 
 		// should have been created before the extended test runs
 		template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{})

diff --git a/test/extended/templates/templateservicebroker_security.go b/test/extended/templates/templateservicebroker_security.go
@@ -44,9 +44,10 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker security test
 	)
 
 	g.BeforeEach(func() {
-		brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
+		err := exutil.WaitForBuilderAccount(cli.KubeClient().Core().ServiceAccounts(cli.Namespace()))
+		o.Expect(err).NotTo(o.HaveOccurred())
 
-		var err error
+		brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
 
 		template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())