fix: prefix execution group names properly (#6166)

* feat: add better prefix for execution names when multiple scheduled in group * fixup
kubeshop · Feb 12, 2025 · e2fbabf · e2fbabf
1 parent 1d414c3
commit e2fbabf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/pkg/testworkflows/testworkflowexecutor/prepared.go b/pkg/testworkflows/testworkflowexecutor/prepared.go
@@ -311,6 +311,10 @@ func (e *IntermediateExecution) SetSequenceNumber(number int32) *IntermediateExe
 	return e
 }
 
+func (e *IntermediateExecution) SequenceNumber() int32 {
+	return e.execution.Number
+}
+
 func (e *IntermediateExecution) SetError(header string, err error) *IntermediateExecution {
 	// Keep only the 1st error
 	if !e.execution.Result.IsFinished() {

diff --git a/pkg/testworkflows/testworkflowexecutor/scheduler.go b/pkg/testworkflows/testworkflowexecutor/scheduler.go
@@ -460,6 +460,9 @@ func (s *scheduler) Schedule(ctx context.Context, sensitiveDataHandler Sensitive
 		// Generating the execution name
 		if intermediate[i].Name() == "" {
 			name := fmt.Sprintf("%s-%d", intermediate[i].WorkflowName(), number)
+			if len(intermediate) > 1 {
+				name = fmt.Sprintf("%s-%d-%d", intermediate[i].WorkflowName(), intermediate[0].SequenceNumber(), i+1)
+			}
 			intermediate[i].SetName(name)
 
 			// Edge case: Check for local duplicates, if there is no clash between static and auto-generated one