From d64b670f379b18f28cd03ea34e307b9bafbb103a Mon Sep 17 00:00:00 2001
From: Kim Tao <kim.tao@mongodb.com>
Date: Fri, 27 Sep 2024 15:18:10 -0400
Subject: [PATCH] CR

---
 model/lifecycle.go              | 7 ++++---
 repotracker/repotracker_test.go | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/model/lifecycle.go b/model/lifecycle.go
index f62c4d9441..98b6e946d1 100644
--- a/model/lifecycle.go
+++ b/model/lifecycle.go
@@ -742,9 +742,6 @@ func createTasksForBuild(ctx context.Context, creationInfo TaskCreationInfo) (ta
 	taskMap := make(map[string]*task.Task)
 	for _, t := range tasksToCreate {
 		id := execTable.GetId(creationInfo.Build.BuildVariant, t.Name)
-		if id == "" {
-			return nil, errors.Errorf("could not find task ID for task '%s' in build variant '%s'", t.Name, creationInfo.Build.BuildVariant)
-		}
 		newTask, err := createOneTask(ctx, id, creationInfo, t)
 		if err != nil {
 			return nil, errors.Wrapf(err, "creating task '%s'", id)
@@ -1127,6 +1124,10 @@ func getTaskCreateTime(creationInfo TaskCreationInfo) (time.Time, error) {
 
 // createOneTask is a helper to create a single task.
 func createOneTask(ctx context.Context, id string, creationInfo TaskCreationInfo, buildVarTask BuildVariantTaskUnit) (*task.Task, error) {
+	if id == "" {
+		return nil, errors.Errorf("cannot create task  '%s' in build variant '%s' for project '%s' with an empty task ID", creationInfo.ProjectRef.Id, buildVarTask.Name, creationInfo.Build.BuildVariant)
+	}
+
 	activateTask := creationInfo.Build.Activated && !creationInfo.ActivationInfo.taskHasSpecificActivation(creationInfo.Build.BuildVariant, buildVarTask.Name)
 
 	// If stepback is enabled, check if the task should be activated via stepback.
diff --git a/repotracker/repotracker_test.go b/repotracker/repotracker_test.go
index bc971b04d3..e0fa3d3dcd 100644
--- a/repotracker/repotracker_test.go
+++ b/repotracker/repotracker_test.go
@@ -1410,7 +1410,7 @@ tasks:
 
 	tasks, err := task.Find(task.ByVersion(v.Id))
 	s.NoError(err)
-	s.Require().Len(tasks, 2)
+	s.Len(tasks, 2)
 
 	var foundTask1, foundTask2 bool
 	var task1DepID, task2ID string