Merge pull request #19827 from bparees/conformance

openshift-merge-robot · web-flow · commit 9190e0d8daff · 2018-06-20T20:08:46.000-07:00
add conformance tag to fast parallel registry tests
diff --git a/test/extended/imageapis/limitrange_admission.go b/test/extended/imageapis/limitrange_admission.go
@@ -21,7 +21,7 @@ import (
 
 const limitRangeName = "limits"
 
-var _ = g.Describe("[Feature:ImageQuota][registry][Serial] Image limit range", func() {
+var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial] Image limit range", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("limitrange-admission", exutil.KubeConfigPath())
 
diff --git a/test/extended/imageapis/quota_admission.go b/test/extended/imageapis/quota_admission.go
@@ -26,7 +26,7 @@ const (
 	waitTimeout = time.Second * 600
 )
 
-var _ = g.Describe("[Feature:ImageQuota][registry][Serial] Image resource quota", func() {
+var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial] Image resource quota", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("resourcequota-admission", exutil.KubeConfigPath())
 
diff --git a/test/extended/images/hardprune.go b/test/extended/images/hardprune.go
@@ -22,7 +22,7 @@ import (
 	testutil "github.com/openshift/origin/test/util"
 )
 
-var _ = g.Describe("[Feature:ImagePrune][registry][Serial] Image hard prune", func() {
+var _ = g.Describe("[Feature:ImagePrune][registry][Serial][Suite:openshift/registry/serial] Image hard prune", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("prune-images", exutil.KubeConfigPath())
 	var originalAcceptSchema2 *bool
diff --git a/test/extended/images/prune.go b/test/extended/images/prune.go
@@ -27,7 +27,7 @@ const (
 	externalImageReference = "docker.io/openshift/origin-release:golang-1.4"
 )
 
-var _ = g.Describe("[Feature:ImagePrune][registry][Serial] Image prune", func() {
+var _ = g.Describe("[Feature:ImagePrune][registry][Serial][Suite:openshift/registry/serial] Image prune", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("prune-images", exutil.KubeConfigPath())
 
diff --git a/test/extended/images/resolve.go b/test/extended/images/resolve.go
@@ -11,7 +11,7 @@ import (
 	exutil "github.com/openshift/origin/test/extended/util"
 )
 
-var _ = g.Describe("[Feature:ImageLookup][registry] Image policy", func() {
+var _ = g.Describe("[Feature:ImageLookup][registry][Conformance] Image policy", func() {
 	defer g.GinkgoRecover()
 	var oc = exutil.NewCLI("resolve-local-names", exutil.KubeConfigPath())
 	one := int64(0)

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const (`
`26`	`26`	`waitTimeout = time.Second * 600`
`27`	`27`	`)`
`28`	`28`
`29`		`-var _ = g.Describe("[Feature:ImageQuota][registry][Serial] Image resource quota", func() {`
	`29`	`+var _ = g.Describe("[Feature:ImageQuota][registry][Serial][Suite:openshift/registry/serial] Image resource quota", func() {`
`30`	`30`	`defer g.GinkgoRecover()`
`31`	`31`	`var oc = exutil.NewCLI("resourcequota-admission", exutil.KubeConfigPath())`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`testutil "github.com/openshift/origin/test/util"`
`23`	`23`	`)`
`24`	`24`
`25`		`-var _ = g.Describe("[Feature:ImagePrune][registry][Serial] Image hard prune", func() {`
	`25`	`+var _ = g.Describe("[Feature:ImagePrune][registry][Serial][Suite:openshift/registry/serial] Image hard prune", func() {`
`26`	`26`	`defer g.GinkgoRecover()`
`27`	`27`	`var oc = exutil.NewCLI("prune-images", exutil.KubeConfigPath())`
`28`	`28`	`var originalAcceptSchema2 *bool`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const (`
`27`	`27`	`externalImageReference = "docker.io/openshift/origin-release:golang-1.4"`
`28`	`28`	`)`
`29`	`29`
`30`		`-var _ = g.Describe("[Feature:ImagePrune][registry][Serial] Image prune", func() {`
	`30`	`+var _ = g.Describe("[Feature:ImagePrune][registry][Serial][Suite:openshift/registry/serial] Image prune", func() {`
`31`	`31`	`defer g.GinkgoRecover()`
`32`	`32`	`var oc = exutil.NewCLI("prune-images", exutil.KubeConfigPath())`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`exutil "github.com/openshift/origin/test/extended/util"`
`12`	`12`	`)`
`13`	`13`
`14`		`-var _ = g.Describe("[Feature:ImageLookup][registry] Image policy", func() {`
	`14`	`+var _ = g.Describe("[Feature:ImageLookup][registry][Conformance] Image policy", func() {`
`15`	`15`	`defer g.GinkgoRecover()`
`16`	`16`	`var oc = exutil.NewCLI("resolve-local-names", exutil.KubeConfigPath())`
`17`	`17`	`one := int64(0)`