Merge pull request openshift#225 from meowfaceman/SDCICD-163

SDCICD-163. Make cluster image set tests work.

Author: openshift-merge-robot

Makefile

@@ -5,6 +5,8 @@ ADDONS_PKG := $(PKG)/suites/addons
 E2E_PKG := $(PKG)/suites/e2e
 SCALE_PKG := $(PKG)/suites/scale
 DOC_PKG := $(PKG)/cmd/osde2e-docs
+MIDDLE_IMAGESETS_PKG := $(PKG)/suites/clusterimagesets/middle
+OLDEST_IMAGESETS_PKG := $(PKG)/suites/clusterimagesets/oldest
 
 DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
@@ -50,10 +52,10 @@ test-addons:
 	go test $(ADDONS_PKG) -test.v -ginkgo.skip="$(GINKGO_SKIP)" -ginkgo.focus="$(GINKGO_FOCUS)"  -test.timeout 8h -test.run TestAddons -e2e-config=$(E2ECONFIG)
 
 test-middle-imageset:
-	go test $(ADDONS_PKG) -test.v -ginkgo.skip="$(GINKGO_SKIP)" -ginkgo.focus="$(GINKGO_FOCUS)"  -test.timeout 8h -test.run TestMiddleImageSet -e2e-config=$(E2ECONFIG)
+	go test $(MIDDLE_IMAGESETS_PKG) -test.v -ginkgo.skip="$(GINKGO_SKIP)" -ginkgo.focus="$(GINKGO_FOCUS)" -test.timeout 8h -test.run TestMiddleImageSet -e2e-config=$(E2ECONFIG)
 
 test-oldest-imageset:
-	go test $(ADDONS_PKG) -test.v -ginkgo.skip="$(GINKGO_SKIP)" -ginkgo.focus="$(GINKGO_FOCUS)"  -test.timeout 8h -test.run TestOldestImageSet -e2e-config=$(E2ECONFIG)
+	go test $(OLDEST_IMAGESETS_PKG) -test.v -ginkgo.skip="$(GINKGO_SKIP)" -ginkgo.focus="$(GINKGO_FOCUS)"  -test.timeout 8h -test.run TestOldestImageSet -e2e-config=$(E2ECONFIG)
 
 test-docker:
 	$(CONTAINER_ENGINE) run \

suites/clusterimagesets/imagesets_test.go …lusterimagesets/middle/imagesets_test.gosuites/clusterimagesets/imagesets_test.go renamed to suites/clusterimagesets/middle/imagesets_test.go suites/clusterimagesets/imagesets_test.go renamed to suites/clusterimagesets/middle/imagesets_test.go

@@ -7,7 +7,13 @@ import (
 	"github.com/openshift/osde2e/common"
 	"github.com/openshift/osde2e/pkg/config"
 	"github.com/openshift/osde2e/pkg/state"
+
 	// import suites to be tested
+	_ "github.com/openshift/osde2e/test/openshift"
+	_ "github.com/openshift/osde2e/test/operators"
+	_ "github.com/openshift/osde2e/test/state"
+	_ "github.com/openshift/osde2e/test/verify"
+	_ "github.com/openshift/osde2e/test/workloads/guestbook"
 )
 
 func TestMiddleImageSet(t *testing.T) {
@@ -35,27 +41,3 @@ func TestMiddleImageSet(t *testing.T) {
 		}
 	}
 }
-
-func TestOldestImageSet(t *testing.T) {
-	// force overwriting the attributes to make sure the cluster with the specified version will be created.
-	cfg := config.Instance
-	state := state.Instance
-
-	cfg.Kubeconfig.Path = ""
-	cfg.Cluster.DestroyAfterTest = true
-	state.Cluster.ID = ""
-	state.Cluster.Version = ""
-
-	versionList, err := common.GetEnabledNoDefaultVersions()
-	if err != nil {
-		log.Printf("Failed to do clusterImageSets testing: %+v\n", err)
-	} else {
-		if len(versionList) == 0 {
-			log.Printf("Skip doing clusterImageSets testing: Default version is covered by the regular testing\n")
-		} else {
-			log.Printf("Start doing clusterImageSets testing with the specified version %+v\n", versionList[0])
-			state.Cluster.Version = versionList[0]
-			common.RunE2ETests(t)
-		}
-	}
-}

suites/clusterimagesets/oldest/imagesets_test.go

@@ -7,10 +7,16 @@ import (
 	"github.com/openshift/osde2e/common"
 	"github.com/openshift/osde2e/pkg/config"
 	"github.com/openshift/osde2e/pkg/state"
+
 	// import suites to be tested
+	_ "github.com/openshift/osde2e/test/openshift"
+	_ "github.com/openshift/osde2e/test/operators"
+	_ "github.com/openshift/osde2e/test/state"
+	_ "github.com/openshift/osde2e/test/verify"
+	_ "github.com/openshift/osde2e/test/workloads/guestbook"
 )
 
-func TestE2E(t *testing.T) {
+func TestOldestImageSet(t *testing.T) {
 	// force overwriting the attributes to make sure the cluster with the specified version will be created.
 	cfg := config.Instance
 	state := state.Instance