From c1358dada1e133052d9519600d351ff096fed8d3 Mon Sep 17 00:00:00 2001
From: Luke Kingland <luke@lukekingland.com>
Date: Thu, 3 Jul 2025 17:13:55 +0900
Subject: [PATCH] chore: fix build and test tags (#2911)

The current build tagging system was predicated on the idea that
integraion, e2e and unit tests are entirely separate.  The correct way
to treat these is as inclusive with unit tests.  Thus this pr removes
the exclusion of unit test from integration tests runs, treating -tags
integration as indicating "unit tests plus integration tests".
---
 pkg/docker/creds/credentials_test.go           | 3 ---
 pkg/docker/pusher_test.go                      | 3 ---
 pkg/docker/runner_test.go                      | 3 ---
 pkg/functions/client_test.go                   | 3 ---
 pkg/functions/config_test.go                   | 3 ---
 pkg/functions/function_envs_unit_test.go       | 3 ---
 pkg/functions/function_git_unit_test.go        | 3 ---
 pkg/functions/function_labels_unit_test.go     | 3 ---
 pkg/functions/function_migrations_unit_test.go | 3 ---
 pkg/functions/function_options_unit_test.go    | 3 ---
 pkg/functions/function_test.go                 | 3 ---
 pkg/functions/function_unit_test.go            | 3 ---
 pkg/functions/function_volumes_unit_test.go    | 3 ---
 pkg/functions/instances_test.go                | 3 ---
 pkg/functions/job_test.go                      | 3 ---
 pkg/functions/repositories_test.go             | 3 ---
 pkg/functions/repository_test.go               | 3 ---
 pkg/functions/runner_test.go                   | 3 ---
 pkg/functions/templates_test.go                | 3 ---
 pkg/knative/deployer_test.go                   | 3 ---
 pkg/pipelines/tekton/validate_test.go          | 3 ---
 pkg/scaffolding/detectors_test.go              | 3 ---
 pkg/scaffolding/scaffold_test.go               | 3 ---
 23 files changed, 69 deletions(-)

diff --git a/pkg/docker/creds/credentials_test.go b/pkg/docker/creds/credentials_test.go
index 91c3212f1..679f9c8b3 100644
--- a/pkg/docker/creds/credentials_test.go
+++ b/pkg/docker/creds/credentials_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package creds_test
 
 import (
diff --git a/pkg/docker/pusher_test.go b/pkg/docker/pusher_test.go
index 82410f288..d94eaca18 100644
--- a/pkg/docker/pusher_test.go
+++ b/pkg/docker/pusher_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package docker_test
 
 import (
diff --git a/pkg/docker/runner_test.go b/pkg/docker/runner_test.go
index 0e1a779fc..1f31945da 100644
--- a/pkg/docker/runner_test.go
+++ b/pkg/docker/runner_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package docker_test
 
 import (
diff --git a/pkg/functions/client_test.go b/pkg/functions/client_test.go
index e920f13a6..d07d36743 100644
--- a/pkg/functions/client_test.go
+++ b/pkg/functions/client_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/config_test.go b/pkg/functions/config_test.go
index 439db4768..de096c33e 100644
--- a/pkg/functions/config_test.go
+++ b/pkg/functions/config_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 // Config tests do not have private access, as they are testing manifest
diff --git a/pkg/functions/function_envs_unit_test.go b/pkg/functions/function_envs_unit_test.go
index f4e392d20..ecc0644eb 100644
--- a/pkg/functions/function_envs_unit_test.go
+++ b/pkg/functions/function_envs_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_git_unit_test.go b/pkg/functions/function_git_unit_test.go
index af624ee11..4243bf7c6 100644
--- a/pkg/functions/function_git_unit_test.go
+++ b/pkg/functions/function_git_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_labels_unit_test.go b/pkg/functions/function_labels_unit_test.go
index 94d4f9cbf..236658c51 100644
--- a/pkg/functions/function_labels_unit_test.go
+++ b/pkg/functions/function_labels_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_migrations_unit_test.go b/pkg/functions/function_migrations_unit_test.go
index 9ebad3316..d11864c39 100644
--- a/pkg/functions/function_migrations_unit_test.go
+++ b/pkg/functions/function_migrations_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_options_unit_test.go b/pkg/functions/function_options_unit_test.go
index a0d59bd1d..9b798b036 100644
--- a/pkg/functions/function_options_unit_test.go
+++ b/pkg/functions/function_options_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_test.go b/pkg/functions/function_test.go
index 943a4826f..3ab929dbb 100644
--- a/pkg/functions/function_test.go
+++ b/pkg/functions/function_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/function_unit_test.go b/pkg/functions/function_unit_test.go
index 6d6f77e9d..5082e33a3 100644
--- a/pkg/functions/function_unit_test.go
+++ b/pkg/functions/function_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/function_volumes_unit_test.go b/pkg/functions/function_volumes_unit_test.go
index 9e49b63a4..4a7decc90 100644
--- a/pkg/functions/function_volumes_unit_test.go
+++ b/pkg/functions/function_volumes_unit_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/instances_test.go b/pkg/functions/instances_test.go
index 947f6832c..1c08e4b7d 100644
--- a/pkg/functions/instances_test.go
+++ b/pkg/functions/instances_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/job_test.go b/pkg/functions/job_test.go
index e9e32265a..191aaa810 100644
--- a/pkg/functions/job_test.go
+++ b/pkg/functions/job_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/repositories_test.go b/pkg/functions/repositories_test.go
index 14d24d4ba..3654ae17e 100644
--- a/pkg/functions/repositories_test.go
+++ b/pkg/functions/repositories_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/repository_test.go b/pkg/functions/repository_test.go
index c5c344c0f..664f232c4 100644
--- a/pkg/functions/repository_test.go
+++ b/pkg/functions/repository_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/functions/runner_test.go b/pkg/functions/runner_test.go
index fa4643fa2..ef051d7e7 100644
--- a/pkg/functions/runner_test.go
+++ b/pkg/functions/runner_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions
 
 import (
diff --git a/pkg/functions/templates_test.go b/pkg/functions/templates_test.go
index 879d62b5e..e9198735d 100644
--- a/pkg/functions/templates_test.go
+++ b/pkg/functions/templates_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package functions_test
 
 import (
diff --git a/pkg/knative/deployer_test.go b/pkg/knative/deployer_test.go
index 90204062c..e8832d325 100644
--- a/pkg/knative/deployer_test.go
+++ b/pkg/knative/deployer_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package knative
 
 import (
diff --git a/pkg/pipelines/tekton/validate_test.go b/pkg/pipelines/tekton/validate_test.go
index 98a7b59be..c7e5d2382 100644
--- a/pkg/pipelines/tekton/validate_test.go
+++ b/pkg/pipelines/tekton/validate_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package tekton
 
 import (
diff --git a/pkg/scaffolding/detectors_test.go b/pkg/scaffolding/detectors_test.go
index e04ca3017..babbb3f88 100644
--- a/pkg/scaffolding/detectors_test.go
+++ b/pkg/scaffolding/detectors_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package scaffolding
 
 import (
diff --git a/pkg/scaffolding/scaffold_test.go b/pkg/scaffolding/scaffold_test.go
index 380c7597b..73ce5101f 100644
--- a/pkg/scaffolding/scaffold_test.go
+++ b/pkg/scaffolding/scaffold_test.go
@@ -1,6 +1,3 @@
-//go:build !integration
-// +build !integration
-
 package scaffolding
 
 import (