Fix flake in the extended tests

Signed-off-by: Gladkov Alexey <agladkov@redhat.com>
openshift · Oct 9, 2017 · e2523a6 · e2523a6
1 parent 09c822e
commit e2523a6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git 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
@@ -775,6 +775,15 @@ func (c *CleanUpContainer) Run() {
 		}
 	}
 
+	// Remove registry database between tests to avoid the influence of one test on another.
+	// TODO: replace this with removals of individual blobs used in the test case.
+	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
@@ -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())