ovh
diff --git a/‎engine/hooks/scheduler.go
Lines changed: 18 additions & 2 deletions b/‎engine/hooks/scheduler.go
Lines changed: 18 additions & 2 deletions
diff --git a/‎engine/hooks/webhook.go
Lines changed: 5 additions & 5 deletions b/‎engine/hooks/webhook.go
Lines changed: 5 additions & 5 deletions
@@ -162,6 +162,7 @@ func (s *Service) deleteTaskExecutionsRoutine(c context.Context) error {
 				continue
 			}
 			for _, t := range tasks {
+				taskToDelete := false
 				execs, err := s.Dao.FindAllTaskExecutions(&t)
 				if err != nil {
 					log.Error("Hooks> deleteTaskExecutionsRoutine > Unable to find all task executions (%s): %v", t.UUID, err)
@@ -172,10 +173,25 @@ func (s *Service) deleteTaskExecutionsRoutine(c context.Context) error {
 				})
 
 				for i, e := range execs {
-					if i >= s.Cfg.ExecutionHistory && e.ProcessingTimestamp != 0 {
-						s.Dao.DeleteTaskExecution(&e)
+					switch e.Type {
+					// Delete all branch deletion task execution
+					case TypeBranchDeletion:
+						if e.Status == TaskExecutionDone && e.ProcessingTimestamp != 0 {
+							s.Dao.DeleteTaskExecution(&e)
+							taskToDelete = true
+						}
+					default:
+						if i >= s.Cfg.ExecutionHistory && e.ProcessingTimestamp != 0 {
+							s.Dao.DeleteTaskExecution(&e)
+						}
 					}
+
+				}
+
+				if taskToDelete {
+					s.Dao.DeleteTask(&t)
 				}
+
 			}
 		}
 	}
 
@@ -53,7 +53,7 @@ func (s *Service) executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.Workflow
 		}
 		if pushEvent.Deleted {
 			branch := strings.TrimPrefix(pushEvent.Ref, "refs/heads/")
-			err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, branch)
+			err := s.enqueueBranchDeletion(projectKey, workflowName, branch)
 
 			return nil, sdk.WrapError(err, "cannot enqueue branch deletion")
 		}
@@ -99,7 +99,7 @@ func (s *Service) executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.Workflow
 		}
 		// Branch deletion ( gitlab return 0000000000000000000000000000000000000000 as git hash)
 		if pushEvent.After == "0000000000000000000000000000000000000000" {
-			err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, strings.TrimPrefix(pushEvent.Ref, "refs/heads/"))
+			err := s.enqueueBranchDeletion(projectKey, workflowName, strings.TrimPrefix(pushEvent.Ref, "refs/heads/"))
 			return nil, sdk.WrapError(err, "cannot enqueue branch deletion")
 		}
 		payload["git.author"] = pushEvent.UserUsername
@@ -142,7 +142,7 @@ func (s *Service) executeRepositoryWebHook(t *sdk.TaskExecution) ([]sdk.Workflow
 
 		for _, pushChange := range pushEvent.Changes {
 			if pushChange.Type == "DELETE" {
-				err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, strings.TrimPrefix(pushChange.RefID, "refs/heads/"))
+				err := s.enqueueBranchDeletion(projectKey, workflowName, strings.TrimPrefix(pushChange.RefID, "refs/heads/"))
 				if err != nil {
 					log.Error("cannot enqueue branch deletion: %v", err)
 				}
@@ -292,7 +292,7 @@ func executeWebHook(t *sdk.TaskExecution) (*sdk.WorkflowNodeRunHookEvent, error)
 	return &h, nil
 }
 
-func (s *Service) enqueueBranchDeletion(uuid, projectKey, workflowName, branch string) error {
+func (s *Service) enqueueBranchDeletion(projectKey, workflowName, branch string) error {
 	config := sdk.WorkflowNodeHookConfig{
 		"project": sdk.WorkflowNodeHookConfigValue{
 			Configurable: false,
@@ -313,7 +313,7 @@ func (s *Service) enqueueBranchDeletion(uuid, projectKey, workflowName, branch s
 	task := sdk.Task{
 		Config: config,
 		Type:   TypeBranchDeletion,
-		UUID:   uuid,
+		UUID:   sdk.UUID(),
 	}
 
 	_, err := s.startTask(context.Background(), &task)
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,7 @@ func (s *Service) deleteTaskExecutionsRoutine(c context.Context) error {`
`162`	`162`	`continue`
`163`	`163`	`}`
`164`	`164`	`for _, t := range tasks {`
	`165`	`+ taskToDelete := false`
`165`	`166`	`execs, err := s.Dao.FindAllTaskExecutions(&t)`
`166`	`167`	`if err != nil {`
`167`	`168`	`log.Error("Hooks> deleteTaskExecutionsRoutine > Unable to find all task executions (%s): %v", t.UUID, err)`
`@@ -172,10 +173,25 @@ func (s *Service) deleteTaskExecutionsRoutine(c context.Context) error {`
`172`	`173`	`})`
`173`	`174`
`174`	`175`	`for i, e := range execs {`
`175`		`- if i >= s.Cfg.ExecutionHistory && e.ProcessingTimestamp != 0 {`
`176`		`- s.Dao.DeleteTaskExecution(&e)`
	`176`	`+ switch e.Type {`
	`177`	`+ // Delete all branch deletion task execution`
	`178`	`+ case TypeBranchDeletion:`
	`179`	`+ if e.Status == TaskExecutionDone && e.ProcessingTimestamp != 0 {`
	`180`	`+ s.Dao.DeleteTaskExecution(&e)`
	`181`	`+ taskToDelete = true`
	`182`	`+ }`
	`183`	`+ default:`
	`184`	`+ if i >= s.Cfg.ExecutionHistory && e.ProcessingTimestamp != 0 {`
	`185`	`+ s.Dao.DeleteTaskExecution(&e)`
	`186`	`+ }`
`177`	`187`	`}`
	`188`	`+`
	`189`	`+ }`
	`190`	`+`
	`191`	`+ if taskToDelete {`
	`192`	`+ s.Dao.DeleteTask(&t)`
`178`	`193`	`}`
	`194`	`+`
`179`	`195`	`}`
`180`	`196`	`}`
`181`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (s Service) executeRepositoryWebHook(t sdk.TaskExecution) ([]sdk.Workflow`
`53`	`53`	`}`
`54`	`54`	`if pushEvent.Deleted {`
`55`	`55`	`branch := strings.TrimPrefix(pushEvent.Ref, "refs/heads/")`
`56`		`- err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, branch)`
	`56`	`+ err := s.enqueueBranchDeletion(projectKey, workflowName, branch)`
`57`	`57`
`58`	`58`	`return nil, sdk.WrapError(err, "cannot enqueue branch deletion")`
`59`	`59`	`}`
`@@ -99,7 +99,7 @@ func (s Service) executeRepositoryWebHook(t sdk.TaskExecution) ([]sdk.Workflow`
`99`	`99`	`}`
`100`	`100`	`// Branch deletion ( gitlab return 0000000000000000000000000000000000000000 as git hash)`
`101`	`101`	`if pushEvent.After == "0000000000000000000000000000000000000000" {`
`102`		`- err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, strings.TrimPrefix(pushEvent.Ref, "refs/heads/"))`
	`102`	`+ err := s.enqueueBranchDeletion(projectKey, workflowName, strings.TrimPrefix(pushEvent.Ref, "refs/heads/"))`
`103`	`103`	`return nil, sdk.WrapError(err, "cannot enqueue branch deletion")`
`104`	`104`	`}`
`105`	`105`	`payload["git.author"] = pushEvent.UserUsername`
`@@ -142,7 +142,7 @@ func (s Service) executeRepositoryWebHook(t sdk.TaskExecution) ([]sdk.Workflow`
`142`	`142`
`143`	`143`	`for _, pushChange := range pushEvent.Changes {`
`144`	`144`	`if pushChange.Type == "DELETE" {`
`145`		`- err := s.enqueueBranchDeletion(t.UUID, projectKey, workflowName, strings.TrimPrefix(pushChange.RefID, "refs/heads/"))`
	`145`	`+ err := s.enqueueBranchDeletion(projectKey, workflowName, strings.TrimPrefix(pushChange.RefID, "refs/heads/"))`
`146`	`146`	`if err != nil {`
`147`	`147`	`log.Error("cannot enqueue branch deletion: %v", err)`
`148`	`148`	`}`
`@@ -292,7 +292,7 @@ func executeWebHook(t sdk.TaskExecution) (sdk.WorkflowNodeRunHookEvent, error)`
`292`	`292`	`return &h, nil`
`293`	`293`	`}`
`294`	`294`
`295`		`-func (s *Service) enqueueBranchDeletion(uuid, projectKey, workflowName, branch string) error {`
	`295`	`+func (s *Service) enqueueBranchDeletion(projectKey, workflowName, branch string) error {`
`296`	`296`	`config := sdk.WorkflowNodeHookConfig{`
`297`	`297`	`"project": sdk.WorkflowNodeHookConfigValue{`
`298`	`298`	`Configurable: false,`
`@@ -313,7 +313,7 @@ func (s *Service) enqueueBranchDeletion(uuid, projectKey, workflowName, branch s`
`313`	`313`	`task := sdk.Task{`
`314`	`314`	`Config: config,`
`315`	`315`	`Type: TypeBranchDeletion,`
`316`		`- UUID: uuid,`
	`316`	`+ UUID: sdk.UUID(),`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`_, err := s.startTask(context.Background(), &task)`