diff --git a/test/extended/images/hardprune.go b/test/extended/images/hardprune.go index 1e66e19c625b..581f10965600 100644 --- a/test/extended/images/hardprune.go +++ b/test/extended/images/hardprune.go @@ -17,7 +17,7 @@ import ( testutil "github.com/openshift/origin/test/util" ) -var _ = g.Describe("[Feature:ImagePrune] Image hard prune", func() { +var _ = g.Describe("[Feature:ImagePrune][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/helper.go b/test/extended/images/helper.go index 11a3c3ca9d54..33fb2acd9ab2 100644 --- a/test/extended/images/helper.go +++ b/test/extended/images/helper.go @@ -775,6 +775,13 @@ func (c *CleanUpContainer) Run() { } } + out, err := c.OC.SetNamespace(metav1.NamespaceDefault).AsAdmin(). + Run("rsh").Args("dc/docker-registry", "find", "/registry", "-mindepth", "1", "-delete").Output() + if err != nil { + fmt.Fprintf(g.GinkgoWriter, "clean up registry failed: %v\n", err) + fmt.Fprintf(g.GinkgoWriter, "%s\n", out) + } + if len(c.imageIDs) == 0 { return } diff --git a/test/extended/images/prune.go b/test/extended/images/prune.go index 79f4f65093ea..2b29713cea33 100644 --- a/test/extended/images/prune.go +++ b/test/extended/images/prune.go @@ -28,7 +28,7 @@ const ( externalImageReference = "docker.io/openshift/origin-release:golang-1.4" ) -var _ = g.Describe("[Feature:ImagePrune] Image prune", func() { +var _ = g.Describe("[Feature:ImagePrune][Serial] Image prune", func() { defer g.GinkgoRecover() var oc = exutil.NewCLI("prune-images", exutil.KubeConfigPath())