Update make test to run envtest tests after basic tests

* Update make rule to run envtest tests using Ginkgo CLI if available
* Update github actions to install ginkgo and upload both coverage files
* Allow skipping envtest tests by setting env var

Signed-off-by: Angel Misevski <[email protected]>

Author: amisevsk

.github/workflows/code-coverage.yml

@@ -40,9 +40,10 @@ jobs:
       name: Run Go Tests
       run: |
         python -m pip install --upgrade pip yq
+        go install github.com/onsi/ginkgo/v2/[email protected]
         make test
     -
       name: Build Codecov report
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
-        files: cover.out
+        files: ./cover.out,./controller.cover.out

.github/workflows/pr.yml

@@ -74,7 +74,6 @@ jobs:
       run: |
         go install github.com/google/addlicense@latest
         go install golang.org/x/tools/cmd/goimports@latest
-
         make check_fmt
         if [[ $? != 0 ]]
         then
@@ -110,12 +109,14 @@ jobs:
       name: Run Go Tests
       run: |
         python -m pip install --upgrade pip yq
+        go install github.com/onsi/ginkgo/v2/[email protected]
         make test
     -
       name: Build Codecov report
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
-        files: cover.out
+        files: ./cover.out,./controller.cover.out
+
 
 
   docker:

Makefile

@@ -96,7 +96,14 @@ update_devworkspace_crds:
 
 ### test: Runs tests
 test: generate fmt vet manifests envtest
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $(shell go list ./... | grep -v test/e2e) -coverprofile cover.out
+  ifneq ($(shell command -v ginkgo 2> /dev/null),)
+	  go test $(shell go list ./... | grep -v test/e2e | grep -v controllers/workspace) -coverprofile cover.out
+	  KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" \
+	    ginkgo run --timeout 5m --randomize-all -coverprofile controller.cover.out controllers/workspace
+  else
+	  KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" \
+	    go test $(shell go list ./... | grep -v test/e2e) -coverprofile cover.out
+  endif
 
 ### test_e2e: Runs e2e test on the cluster set in context. DevWorkspace Operator must be already deployed
 test_e2e:

controllers/workspace/suite_test.go

@@ -64,9 +64,9 @@ var (
 )
 
 func TestAPIs(t *testing.T) {
-	// if os.Getenv("TEST_CONTROLLER") != "true" {
-	// 	t.Skip()
-	// }
+	if os.Getenv("SKIP_CONTROLLER_TESTS") == "true" {
+		t.Skip()
+	}
 
 	RegisterFailHandler(Fail)
 

pkg/library/container/container_test.go

@@ -66,7 +66,6 @@ func loadTestCaseOrPanic(t *testing.T, testPath string) testCase {
 	if err := yaml.Unmarshal(bytes, &test); err != nil {
 		t.Fatal(err)
 	}
-	t.Logf("Read file:\n%+v\n\n", test)
 	return test
 }
 

pkg/library/lifecycle/prestart_test.go

@@ -16,7 +16,6 @@
 package lifecycle
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
@@ -48,7 +47,6 @@ func loadPreStartTestCaseOrPanic(t *testing.T, testFilename string) preStartTest
 	if err := yaml.Unmarshal(bytes, &test); err != nil {
 		t.Fatal(err)
 	}
-	t.Log(fmt.Sprintf("Read file:\n%+v\n\n", test))
 	return test
 }