Bug 1782467: move more image-eco db template tests from upstream repos to sample o…

examples/jenkins/pipeline/nodejs-sample-pipeline.yaml

@@ -7,7 +7,7 @@ spec:
     jenkinsPipelineStrategy:
       jenkinsfile: |-
         // path of the template to use
-        def templatePath = 'https://raw.githubusercontent.com/openshift/nodejs-ex/master/openshift/templates/nodejs-mongodb.json'
+        def templatePath = 'nodejs-mongodb-example'
         // name of the template that will be created
         def templateName = 'nodejs-mongodb-example'
         // NOTE, the "pipeline" directive/closure from the declarative pipeline syntax needs to include, or be nested outside,

test/extended/image_ecosystem/mariadb_ephemeral.go

@@ -12,7 +12,7 @@ import (
 var _ = g.Describe("[image_ecosystem][mariadb][Slow] openshift mariadb image", func() {
 	defer g.GinkgoRecover()
 	var (
-		templatePath = exutil.FixturePath("..", "..", "examples", "db-templates", "mariadb-ephemeral-template.json")
+		templatePath = "mariadb-ephemeral"
 		oc           = exutil.NewCLI("mariadb-create", exutil.KubeConfigPath())
 	)
 
@@ -33,8 +33,8 @@ var _ = g.Describe("[image_ecosystem][mariadb][Slow] openshift mariadb image", f
 			g.It(fmt.Sprintf("should instantiate the template"), func() {
 				exutil.WaitForOpenShiftNamespaceImageStreams(oc)
 
-				g.By(fmt.Sprintf("calling oc process -f %q", templatePath))
-				configFile, err := oc.Run("process").Args("-f", templatePath).OutputToFile("config.json")
+				g.By(fmt.Sprintf("calling oc process %q", templatePath))
+				configFile, err := oc.Run("process").Args("openshift//" + templatePath).OutputToFile("config.json")
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				g.By(fmt.Sprintf("calling oc create -f %q", configFile))

test/extended/image_ecosystem/mongodb_ephemeral.go

@@ -15,7 +15,7 @@ import (
 var _ = g.Describe("[image_ecosystem][mongodb] openshift mongodb image", func() {
 	defer g.GinkgoRecover()
 
-	templatePath := exutil.FixturePath("..", "..", "examples", "db-templates", "mongodb-ephemeral-template.json")
+	templatePath := "mongodb-ephemeral"
 	oc := exutil.NewCLI("mongodb-create", exutil.KubeConfigPath()).Verbose()
 
 	g.Context("", func() {
@@ -35,7 +35,7 @@ var _ = g.Describe("[image_ecosystem][mongodb] openshift mongodb image", func()
 
 				exutil.WaitForOpenShiftNamespaceImageStreams(oc)
 				g.By("creating a new app")
-				o.Expect(oc.Run("new-app").Args("-f", templatePath).Execute()).Should(o.Succeed())
+				o.Expect(oc.Run("new-app").Args(templatePath).Execute()).Should(o.Succeed())
 
 				g.By("waiting for the deployment to complete")
 				err := exutil.WaitForDeploymentConfig(oc.KubeClient(), oc.AppsClient().AppsV1(), oc.Namespace(), "mongodb", 1, true, oc)

test/extended/image_ecosystem/mysql_ephemeral.go

@@ -12,7 +12,7 @@ import (
 var _ = g.Describe("[image_ecosystem][mysql][Slow] openshift mysql image", func() {
 	defer g.GinkgoRecover()
 	var (
-		templatePath = exutil.FixturePath("..", "..", "examples", "db-templates", "mysql-ephemeral-template.json")
+		templatePath = "mysql-ephemeral"
 		oc           = exutil.NewCLI("mysql-create", exutil.KubeConfigPath())
 	)
 
@@ -31,8 +31,8 @@ var _ = g.Describe("[image_ecosystem][mysql][Slow] openshift mysql image", func(
 		g.Describe("Creating from a template", func() {
 			g.It(fmt.Sprintf("should instantiate the template"), func() {
 
-				g.By(fmt.Sprintf("calling oc process -f %q", templatePath))
-				configFile, err := oc.Run("process").Args("-f", templatePath).OutputToFile("config.json")
+				g.By(fmt.Sprintf("calling oc process %q", templatePath))
+				configFile, err := oc.Run("process").Args("openshift//" + templatePath).OutputToFile("config.json")
 				o.Expect(err).NotTo(o.HaveOccurred())
 
 				g.By(fmt.Sprintf("calling oc create -f %q", configFile))