test(e2e): avoid flake on postgres tests (#8788)

Looks like in some cases the containers are not fully removed before we create the new ones. We make sure to use different container names to avoid these kind of flakes Signed-off-by: Charly Molter <[email protected]>
kumahq · Jan 10, 2024 · 455fa04 · 455fa04
1 parent 29b725e
commit 455fa04
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/test/e2e_env/multizone/resilience/resilience_multizone_universal_postgres.go b/test/e2e_env/multizone/resilience/resilience_multizone_universal_postgres.go
@@ -12,14 +12,17 @@ import (
 )
 
 func ResilienceMultizoneUniversalPostgres() {
-	const clusterName1 = "kuma-respos1"
-	const clusterName2 = "kuma-respos2"
+	var clusterName1 string
+	var clusterName2 string
 
 	var global, zoneUniversal Cluster
 
 	BeforeEach(func() {
+		testingT := NewTestingT()
+		clusterName1 = "kuma1-" + testingT.Hash()
+		clusterName2 = "kuma2-" + testingT.Hash()
 		// Global
-		global = NewUniversalCluster(NewTestingT(), clusterName1, Verbose)
+		global = NewUniversalCluster(testingT, clusterName1, Verbose)
 
 		err := NewClusterSetup().
 			Install(postgres.Install(clusterName1)).

diff --git a/test/framework/testing.go b/test/framework/testing.go
@@ -1,8 +1,11 @@
 package framework
 
 import (
+	"hash/fnv"
+
 	"github.com/gruntwork-io/terratest/modules/logger"
 	"github.com/onsi/ginkgo/v2"
+	"k8s.io/apimachinery/pkg/util/rand"
 )
 
 type TestingT struct {
@@ -21,6 +24,12 @@ func (i *TestingT) Name() string {
 	return i.desc.FullText()
 }
 
+func (i *TestingT) Hash() string {
+	hash := fnv.New32()
+	_, _ = hash.Write([]byte(i.Name()))
+	return rand.SafeEncodeString(string(hash.Sum(nil)))
+}
+
 // Logf logs a test progress message.
 func Logf(format string, args ...interface{}) {
 	logger.Default.Logf(ginkgo.GinkgoT(), format, args...)