Merge pull request kubernetes-retired#289 from m-messiah/enable-virtualcluster-test

🐛 Add virtualcluster tests to CI

Author: k8s-ci-robot

scripts/ci-test.sh

@@ -27,4 +27,10 @@ source ./scripts/fetch_ext_bins.sh && \
 	setup_envs && \
 
 cd "${REPO_ROOT}" && \
-	make generate test
+	make generate test
+
+echo "==================="
+echo "Test virtualcluster"
+
+cd "${REPO_ROOT}/virtualcluster/" && \
+ 	make test

scripts/fetch_ext_bins.sh

@@ -108,4 +108,5 @@ function setup_envs {
   export TEST_ASSET_KUBECTL=/tmp/kubebuilder/bin/kubectl
   export TEST_ASSET_KUBE_APISERVER=/tmp/kubebuilder/bin/kube-apiserver
   export TEST_ASSET_ETCD=/tmp/kubebuilder/bin/etcd
+  export KUBEBUILDER_ASSETS=/tmp/kubebuilder/bin/
 }

virtualcluster/Makefile

@@ -21,7 +21,7 @@ DOCKER_REG ?= ${or ${VC_DOCKER_REGISTRY},"virtualcluster"}
 IMG ?= ${DOCKER_REG}/manager-amd64 ${DOCKER_REG}/vn-agent-amd64 ${DOCKER_REG}/syncer-amd64
 
 # TEST_FLAGS used as flags of go test.
-TEST_FLAGS ?= -v --race
+TEST_FLAGS ?= -v
 
 # COVERAGE_PACKAGES is the coverage we care about.
 COVERAGE_PACKAGES=$(shell go list ./... | \
@@ -33,6 +33,8 @@ COVERAGE_PACKAGES=$(shell go list ./... | \
 # CRD_OPTIONS ?= "crd:trivialVersions=true"
 CRD_OPTIONS ?= "crd:trivialVersions=true,maxDescLen=0"
 
+export KUBEBUILDER_ASSETS=/tmp/kubebuilder/bin/
+
 # Build code.
 #
 # Args:

virtualcluster/pkg/controller/controllers/suite_test.go

@@ -55,12 +55,13 @@ func TestAPIs(t *testing.T) {
 		[]Reporter{printer.NewlineReporter{}})
 }
 
-var _ = BeforeSuite(func(done Done) {
+var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "config", "crd")},
+		ErrorIfCRDPathMissing: true,
 	}
 
 	var err error
@@ -101,8 +102,6 @@ var _ = BeforeSuite(func(done Done) {
 
 	cli = mgr.GetClient()
 	Expect(cli).ToNot(BeNil())
-
-	close(done)
 }, 60)
 
 var _ = AfterSuite(func() {