Merge pull request #11445 from gabemontero/pluginExtTestToImageEco

OpenShift Bot · web-flow · commit f0ed2abbaca1 · 2016-10-25T06:59:36.000-04:00
Merged by openshift-bot
diff --git a/test/extended/extended_test.go b/test/extended/extended_test.go
@@ -13,7 +13,6 @@ import (
 	_ "github.com/openshift/origin/test/extended/image_ecosystem"
 	_ "github.com/openshift/origin/test/extended/imageapis"
 	_ "github.com/openshift/origin/test/extended/images"
-	_ "github.com/openshift/origin/test/extended/jenkins"
 	_ "github.com/openshift/origin/test/extended/jobs"
 	_ "github.com/openshift/origin/test/extended/localquota"
 	_ "github.com/openshift/origin/test/extended/networking"
diff --git a/test/extended/image_ecosystem/kubernetes_plugin.go b/test/extended/image_ecosystem/kubernetes_plugin.go
@@ -1,4 +1,4 @@
-package jenkins
+package image_ecosystem
 
 import (
 	"encoding/json"
@@ -50,7 +50,7 @@ func patchTemplate(filename string, outDir string) string {
 	return outputFile
 }
 
-var _ = g.Describe("[jenkins] schedule jobs on pod slaves", func() {
+var _ = g.Describe("[image_ecosystem][jenkins] schedule jobs on pod slaves", func() {
 	defer g.GinkgoRecover()
 
 	var (
diff --git a/test/extended/image_ecosystem/plugin.go b/test/extended/image_ecosystem/plugin.go
@@ -1,4 +1,4 @@
-package jenkins
+package image_ecosystem
 
 import (
 	g "github.com/onsi/ginkgo"
@@ -29,6 +29,7 @@ func getAdminPassword(oc *exutil.CLI) string {
 			return s[1]
 		}
 	}
+	// use the image default of password if not set
 	return "password"
 }
 
@@ -119,7 +120,7 @@ func jenkinsJobBytes(filename, namespace string) []byte {
 	return data
 }
 
-var _ = g.Describe("[jenkins][Slow] openshift pipeline plugin", func() {
+var _ = g.Describe("[image_ecosystem][jenkins][Slow] openshift pipeline plugin", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("jenkins-plugin", exutil.KubeConfigPath())
 	var hostPort string

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package jenkins`
	`1`	`+package image_ecosystem`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`g "github.com/onsi/ginkgo"`
`@@ -29,6 +29,7 @@ func getAdminPassword(oc *exutil.CLI) string {`
`29`	`29`	`return s[1]`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+ // use the image default of password if not set`
`32`	`33`	`return "password"`
`33`	`34`	`}`
`34`	`35`
`@@ -119,7 +120,7 @@ func jenkinsJobBytes(filename, namespace string) []byte {`
`119`	`120`	`return data`
`120`	`121`	`}`
`121`	`122`
`122`		`-var _ = g.Describe("[jenkins][Slow] openshift pipeline plugin", func() {`
	`123`	`+var _ = g.Describe("[image_ecosystem][jenkins][Slow] openshift pipeline plugin", func() {`
`123`	`124`	`defer g.GinkgoRecover()`
`124`	`125`	`var oc = exutil.NewCLI("jenkins-plugin", exutil.KubeConfigPath())`
`125`	`126`	`var hostPort string`