Merge pull request #5200 from camilamacedo86/test-organization

🌱 Reorganise tests: separate unit and integration tests with build tags

Author: k8s-ci-robot

.github/workflows/coverage.yml

@@ -22,6 +22,9 @@ jobs:
       - name: Remove pre-installed kustomize
         run: sudo rm -f /usr/local/bin/kustomize
 
+      - name: Install Kubebuilder
+        run: make install
+
       - name: Run tests with coverage
         run: make test-coverage
 

AGENTS.md

@@ -32,7 +32,7 @@ pkg/
     external/            External plugin support
 docs/book/      mdBook sources + tutorial samples
 test/
-  e2e/          End-to-end tests (v4, helm, deployimage, alpha*)
+  e2e/          End-to-end tests requiring Kubernetes cluster (v4, helm, deployimage)
   testdata/     Testdata generation scripts
 testdata/       Generated sample projects (DO NOT EDIT)
 hack/docs/      Documentation generation scripts
@@ -82,8 +82,7 @@ make lint-fix   # Auto-fix Go code
 ### Testing
 ```bash
 make test-unit         # Fast unit tests (./pkg/..., ./test/e2e/utils/...)
-make test-integration  # Integration tests
-make test-features     # Feature tests
+make test-integration  # Integration tests (may create temp dirs, download binaries)
 make test-testdata     # Test all testdata projects
 make test-e2e-local    # Full e2e (creates kind cluster)
 make test              # CI aggregate (all of above + license)
@@ -191,6 +190,17 @@ kubebuilder alpha update    # Update to latest plugin versions
 - Use **Ginkgo v2** + **Gomega** for BDD-style tests.
 - Tests depending on the Kubebuilder binary should use: `utils.NewTestContext(util.KubebuilderBinName, "GO111MODULE=on")`
 
+### Test Organization
+- **Unit tests** (`*_test.go` in `pkg/`) - Test individual packages in isolation, fast
+- **Integration tests** (`*_integration_test.go` in `pkg/`) - Test multiple components together without cluster
+  - Must have `//go:build integration` tag at the top
+  - May create temp dirs, download binaries, or scaffold files
+  - Examples: alpha update, grafana scaffolding, helm chart generation
+- **E2E tests** (`test/e2e/`) - **ONLY** for tests requiring a Kubernetes cluster (KIND)
+  - `v4/plugin_cluster_test.go` - Test v4 plugin deployment
+  - `helm/plugin_cluster_test.go` - Test Helm chart deployment
+  - `deployimage/plugin_cluster_test.go` - Test deploy-image plugin
+
 ### Scaffolding
 - Use library helpers from `pkg/plugin/util/`
 - Use markers for extensibility

Makefile

@@ -145,25 +145,21 @@ go-apidiff:
 ##@ Tests
 
 .PHONY: test
-test: test-unit test-integration test-features test-testdata test-book test-license ## Run the unit and integration tests (used in the CI)
+test: test-unit test-integration test-testdata test-book test-license ## Run the unit and integration tests (used in the CI)
 
 .PHONY: test-unit
 TEST_PKGS := ./pkg/... ./test/e2e/utils/...
 test-unit: ## Run the unit tests
 	go test -race $(TEST_PKGS)
 
+.PHONY: test-integration
+test-integration: install ## Run the integration tests (requires kubebuilder binary in PATH)
+	go test -race -tags=integration -timeout 30m $(TEST_PKGS)
+
 .PHONY: test-coverage
-test-coverage: ## Run unit tests creating the output to report coverage
+test-coverage: ## Run unit and integration tests with coverage report
 	- rm -rf *.out  # Remove all coverage files if exists
-	go test -race -failfast -tags=integration -coverprofile=coverage-all.out -coverpkg="./pkg/cli/...,./pkg/config/...,./pkg/internal/...,./pkg/machinery/...,./pkg/model/...,./pkg/plugin/...,./pkg/plugins/golang/...,./pkg/plugins/external/...,./pkg/plugins/optional/grafana/...,./pkg/plugins/optional/helm/v2alpha/..." $(TEST_PKGS)
-
-.PHONY: test-features
-test-features: ## Run the integration tests
-	./test/features.sh
-
-.PHONY: test-integration
-test-integration: ## Run the integration tests
-	./test/integration.sh
+	go test -race -failfast -tags=integration -timeout 30m -coverprofile=coverage-all.out -coverpkg="./pkg/cli/...,./pkg/config/...,./pkg/internal/...,./pkg/machinery/...,./pkg/model/...,./pkg/plugin/...,./pkg/plugins/golang/...,./pkg/plugins/external/...,./pkg/plugins/optional/grafana/...,./pkg/plugins/optional/helm/v2alpha/..." $(TEST_PKGS)
 
 .PHONY: check-testdata
 check-testdata: ## Run the script to ensure that the testdata is updated

pkg/cli/alpha/internal/common/common_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 

test/e2e/alphaupdate/update_test.go renamed to pkg/cli/alpha/internal/update/integration_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 
@@ -14,7 +17,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package alphaupdate
+package update
 
 import (
 	"bytes"

pkg/cli/alpha/internal/update/prepare_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 

pkg/cli/alpha/internal/update/update_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 

pkg/cli/alpha/internal/update/validate_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 

pkg/plugins/optional/grafana/v1alpha/scaffolds/edit_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.
 

pkg/plugins/optional/grafana/v1alpha/scaffolds/init_test.go

@@ -1,3 +1,6 @@
+//go:build integration
+// +build integration
+
 /*
 Copyright 2025 The Kubernetes Authors.