Merge pull request #1636 from zimnx/mz/extend-rollout-timeout-for-cle…

…anup-jobs Extend ScyllaCluster rollout timeout in E2E
scylladb · Dec 14, 2023 · f157cd5 · f157cd5
2 parents f550d4a + 16f7f13
commit f157cd5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/test/e2e/utils/config.go b/test/e2e/utils/config.go
@@ -12,6 +12,7 @@ const (
 	SyncTimeout        = 2 * time.Minute
 	imagePullTimeout   = 4 * time.Minute
 	joinClusterTimeout = 3 * time.Minute
+	cleanupJobTimeout  = 1 * time.Minute
 
 	// memberRolloutTimeout is the maximum amount of time it takes to start a scylla pod and become ready.
 	// It includes the time to pull the images, copy the necessary files (sidecar), join the cluster and similar.

diff --git a/test/e2e/utils/helpers.go b/test/e2e/utils/helpers.go
@@ -116,7 +116,7 @@ func IsNodeConfigDoneWithNodeTuningFunc(nodes []*corev1.Node) func(nc *scyllav1a
 }
 
 func RolloutTimeoutForScyllaCluster(sc *scyllav1.ScyllaCluster) time.Duration {
-	return SyncTimeout + time.Duration(GetMemberCount(sc))*memberRolloutTimeout
+	return SyncTimeout + time.Duration(GetMemberCount(sc))*memberRolloutTimeout + cleanupJobTimeout
 }
 
 func GetMemberCount(sc *scyllav1.ScyllaCluster) int32 {