fixup extended tests to use bindable template

Author: Jim Minter

test/extended/setup.sh

@@ -148,6 +148,9 @@ function os::test::extended::setup () {
 
 	os::log::info "Creating quickstart templates"
 	oc create -n openshift -f "${OS_ROOT}/examples/quickstarts" --config="${ADMIN_KUBECONFIG}"
+
+	os::log::info "Creating db-templates templates"
+	oc create -n openshift -f "${OS_ROOT}/examples/db-templates" --config="${ADMIN_KUBECONFIG}"
 }
 
 # Run extended tests or print out a list of tests that need to be run

test/extended/templates/templateservicebroker_e2e.go

@@ -64,7 +64,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te
 		cliUser = &user.DefaultInfo{Name: cli.Username(), Groups: []string{"system:authenticated"}}
 
 		// should have been created before the extended test runs
-		template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{})
+		template, err = cli.TemplateClient().Template().Templates("openshift").Get("mysql-ephemeral", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		processedtemplate, err = internalversion.NewTemplateProcessorClient(cli.AdminTemplateClient().Template().RESTClient(), "openshift").Process(template)
@@ -155,17 +155,17 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te
 				Namespace: cli.Namespace(),
 			},
 			Parameters: map[string]string{
-				"DATABASE_USER": "test",
+				"MYSQL_USER": "test",
 			},
 		})
 		if err != nil {
 			templateInstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{})
 			if err != nil {
-				fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v", err)
+				fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v\n", err)
 			} else {
 				err := dumpObjectReadiness(cli, templateInstance)
 				if err != nil {
-					fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v", err)
+					fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v\n", err)
 				}
 			}
 		}
@@ -237,10 +237,10 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te
 		}))
 		o.Expect(secret.Type).To(o.Equal(v1.SecretTypeOpaque))
 		o.Expect(secret.Data).To(o.Equal(map[string][]byte{
-			"DATABASE_USER": []byte("test"),
+			"MYSQL_USER": []byte("test"),
 		}))
 
-		examplesecret, err := cli.KubeClient().CoreV1().Secrets(cli.Namespace()).Get("cakephp-mysql-example", metav1.GetOptions{})
+		examplesecret, err := cli.KubeClient().CoreV1().Secrets(cli.Namespace()).Get("mysql", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		o.Expect(examplesecret.OwnerReferences).To(o.ContainElement(metav1.OwnerReference{
@@ -268,7 +268,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker end-to-end te
 		o.Expect(brokerTemplateInstance.Spec.BindingIDs).To(o.Equal([]string{bindingID}))
 
 		o.Expect(bind.Credentials).To(o.HaveKey("uri"))
-		o.Expect(bind.Credentials["uri"]).To(o.HavePrefix("http://"))
+		o.Expect(bind.Credentials["uri"]).To(o.HavePrefix("mysql://"))
 	}
 
 	unbind := func() {

test/extended/templates/templateservicebroker_security.go

@@ -53,7 +53,7 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker security test
 
 		brokercli, portForwardCmdClose = EnsureTSB(tsbOC)
 
-		template, err = cli.TemplateClient().Template().Templates("openshift").Get("cakephp-mysql-example", metav1.GetOptions{})
+		template, err = cli.TemplateClient().Template().Templates("openshift").Get("mysql-ephemeral", metav1.GetOptions{})
 		o.Expect(err).NotTo(o.HaveOccurred())
 
 		clusterrolebinding, err = cli.AdminAuthorizationClient().Authorization().ClusterRoleBindings().Create(&authorizationapi.ClusterRoleBinding{
@@ -122,11 +122,11 @@ var _ = g.Describe("[Conformance][templates] templateservicebroker security test
 		if err != nil {
 			templateInstance, err := cli.TemplateClient().Template().TemplateInstances(cli.Namespace()).Get(instanceID, metav1.GetOptions{})
 			if err != nil {
-				fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v", err)
+				fmt.Fprintf(g.GinkgoWriter, "error getting TemplateInstance after failed provision: %v\n", err)
 			} else {
 				err := dumpObjectReadiness(cli, templateInstance)
 				if err != nil {
-					fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v", err)
+					fmt.Fprintf(g.GinkgoWriter, "error running dumpObjectReadiness: %v\n", err)
 				}
 			}
 		}