test: parallel execution of e2e tests

osmman · osmman · commit 54032cd32b0f · 2025-06-02T18:38:26.000+02:00
diff --git a/Makefile b/Makefile
@@ -136,7 +136,7 @@ test: manifests generate fmt vet envtest ## Run tests.
 # Utilize Kind or modify the e2e tests to load the image locally, enabling compatibility with other vendors.
 .PHONY: test-e2e  # Run the e2e tests against a Kind k8s instance that is spun up.
 test-e2e: generate
-	go test -p 1 ./test/e2e/... -tags=integration -timeout 20m
+	go test ./test/e2e/... -tags=integration -timeout 20m
 
 # Switch images from `registry.redhat.io` images to the dev images
 .PHONY: dev-images
diff --git a/go.mod b/go.mod
@@ -3,6 +3,7 @@ module github.com/securesign/operator
 go 1.23.6
 
 require (
+	github.com/alexflint/go-filemutex v1.3.0
 	github.com/blang/semver/v4 v4.0.0
 	github.com/go-logr/logr v1.4.3
 	github.com/google/certificate-transparency-go v1.3.1
diff --git a/go.sum b/go.sum
@@ -1,3 +1,5 @@
+github.com/alexflint/go-filemutex v1.3.0 h1:LgE+nTUWnQCyRKbpoceKZsPQbs84LivvgwUymZXdOcM=
+github.com/alexflint/go-filemutex v1.3.0/go.mod h1:U0+VA/i30mGBlLCrFPGtTe9y6wGQfNAWPBTekHQ+c8A=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -134,6 +136,7 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -173,6 +176,7 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
@@ -204,6 +208,7 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/test/benchmark/install_test.go b/test/benchmark/install_test.go
diff --git a/test/e2e/byo/database_test.go b/test/e2e/byo/database_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package e2e
+package byo
 
 import (
 	"context"
diff --git a/test/e2e/byo/provided_certs_test.go b/test/e2e/byo/provided_certs_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package e2e
+package byo
 
 import (
 	"context"
diff --git a/test/e2e/byo/suite_test.go b/test/e2e/byo/suite_test.go
@@ -0,0 +1,23 @@
+//go:build integration
+
+package byo
+
+import (
+	"testing"
+	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/format"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+func TestE2e(t *testing.T) {
+	RegisterFailHandler(Fail)
+	log.SetLogger(GinkgoLogr)
+	SetDefaultEventuallyTimeout(time.Duration(3) * time.Minute)
+	RunSpecs(t, "Bring your own")
+
+	// print whole stack in case of failure
+	format.MaxLength = 0
+}
diff --git a/test/e2e/custom_install/proxy_test.go b/test/e2e/custom_install/proxy_test.go
@@ -44,7 +44,7 @@ var noProxy = []string{
 	"localhost",
 }
 
-var _ = Describe("Securesign install in proxy-env", Ordered, func() {
+var _ = Describe("Install operator in proxy-env", Ordered, func() {
 	cli, _ := support.CreateClient()
 	ctx := context.TODO()
 
diff --git a/test/e2e/custom_install/suite_test.go b/test/e2e/custom_install/suite_test.go
@@ -1,3 +1,5 @@
+//go:build custom_install
+
 package custom_install
 
 import (
diff --git a/test/e2e/deployment/common_test.go b/test/e2e/deployment/common_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package e2e
+package deployment
 
 import (
 	"context"
@@ -32,7 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
-var _ = Describe("Securesign install with certificate generation", Ordered, func() {
+var _ = Describe("Install with generated certs and keys", Ordered, func() {
 	cli, _ := support.CreateClient()
 	ctx := context.TODO()
 
diff --git a/test/e2e/deployment/key_autodiscovery_test.go b/test/e2e/deployment/key_autodiscovery_test.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package e2e
+package deployment
 
 import (
 	"context"
@@ -24,7 +24,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var _ = Describe("Securesign key autodiscovery test", Ordered, func() {
+var _ = Describe("Install with auto-discovered keys", Ordered, func() {
 	cli, _ := support.CreateClient()
 	ctx := context.TODO()
 
diff --git a/test/e2e/deployment/namespaced.go b/test/e2e/deployment/namespaced.go
@@ -1,6 +1,6 @@
 //go:build integration
 
-package e2e
+package deployment
 
 import (
 	"context"
diff --git a/test/e2e/deployment/suite_test.go b/test/e2e/deployment/suite_test.go
@@ -0,0 +1,23 @@
+//go:build integration
+
+package deployment
+
+import (
+	"testing"
+	"time"
+
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+	"github.com/onsi/gomega/format"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+)
+
+func TestE2e(t *testing.T) {
+	RegisterFailHandler(Fail)
+	log.SetLogger(GinkgoLogr)
+	SetDefaultEventuallyTimeout(time.Duration(3) * time.Minute)
+	RunSpecs(t, "Deployment Suite")
+
+	// print whole stack in case of failure
+	format.MaxLength = 0
+}
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
@@ -1,3 +1,5 @@
+//go:build integration
+
 package e2e
 
 import (
@@ -14,7 +16,7 @@ func TestE2e(t *testing.T) {
 	RegisterFailHandler(Fail)
 	log.SetLogger(GinkgoLogr)
 	SetDefaultEventuallyTimeout(time.Duration(3) * time.Minute)
-	RunSpecs(t, "Trusted Artifact Signer E2E Suite")
+	RunSpecs(t, "E2E Suite")
 
 	// print whole stack in case of failure
 	format.MaxLength = 0
diff --git a/test/e2e/support/tas/tas.go b/test/e2e/support/tas/tas.go
@@ -2,8 +2,11 @@ package tas
 
 import (
 	"context"
+	"os"
+	"path/filepath"
 	"time"
 
+	"github.com/alexflint/go-filemutex"
 	"github.com/securesign/operator/test/e2e/support/tas/securesign"
 	"github.com/securesign/operator/test/e2e/support/tas/tsa"
 
@@ -19,6 +22,8 @@ import (
 	runtimeCli "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
+const lockFileName = "cosign.lock"
+
 func VerifyAllComponents(ctx context.Context, cli runtimeCli.Client, s *rhtasv1alpha1.Securesign, dbPresent bool) {
 	trillian.Verify(ctx, cli, s.Namespace, s.Name, dbPresent)
 	fulcio.Verify(ctx, cli, s.Namespace, s.Name)
@@ -30,6 +35,17 @@ func VerifyAllComponents(ctx context.Context, cli runtimeCli.Client, s *rhtasv1a
 }
 
 func VerifyByCosign(ctx context.Context, cli runtimeCli.Client, s *rhtasv1alpha1.Securesign, targetImageName string) {
+	var m *filemutex.FileMutex
+	var err error
+	lockFilePath := filepath.Join(os.TempDir(), lockFileName)
+	m, err = filemutex.New(lockFilePath)
+	if err != nil {
+		panic(err)
+	}
+
+	_ = m.Lock()
+	defer func() { _ = m.Unlock() }()
+
 	f := fulcio.Get(ctx, cli, s.Namespace, s.Name)()
 	Expect(f).ToNot(BeNil())
 
diff --git a/test/e2e/update/suite_test.go b/test/e2e/update/suite_test.go
@@ -28,7 +28,7 @@ func TestUpdateComponents(t *testing.T) {
 	RegisterFailHandler(Fail)
 	log.SetLogger(GinkgoLogr)
 	SetDefaultEventuallyTimeout(time.Duration(1) * time.Minute)
-	RunSpecs(t, "Update components E2E Suite")
+	RunSpecs(t, "Update components Suite")
 
 	// print whole stack in case of failure
 	format.MaxLength = 0

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ var noProxy = []string{`
`44`	`44`	`"localhost",`
`45`	`45`	`}`
`46`	`46`
`47`		`-var _ = Describe("Securesign install in proxy-env", Ordered, func() {`
	`47`	`+var _ = Describe("Install operator in proxy-env", Ordered, func() {`
`48`	`48`	`cli, _ := support.CreateClient()`
`49`	`49`	`ctx := context.TODO()`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build custom_install`
	`2`	`+`
`1`	`3`	`package custom_install`
`2`	`4`
`3`	`5`	`import (`