Orchestrator mode: locking project report failure status (#1481)

* projects that fail to aquire lock should have failed status

Author: motatoes

cli/cmd/digger/main.go

@@ -201,8 +201,8 @@ func gitHubCI(lock core_locking.Lock, policyChecker core_policy.Checker, backend
 
 		jobs := []orchestrator.Job{orchestrator.JsonToJob(job)}
 
-		_, _, err = digger.RunJobs(jobs, &githubPrService, &githubPrService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, inputs.Id, true, commentId64, currentDir)
-		if err != nil {
+		allAppliesSuccess, _, err := digger.RunJobs(jobs, &githubPrService, &githubPrService, lock, reporter, planStorage, policyChecker, commentUpdater, backendApi, inputs.Id, true, commentId64, currentDir)
+		if !allAppliesSuccess || err != nil {
 			serializedBatch, reportingError := backendApi.ReportProjectJobStatus(repoName, job.ProjectName, inputs.Id, "failed", time.Now(), nil)
 			if reportingError != nil {
 				reportErrorAndExit(githubActor, fmt.Sprintf("Failed run commands. %s", err), 5)

cli/pkg/digger/digger.go

@@ -115,7 +115,12 @@ func RunJobs(
 				if reportErr != nil {
 					log.Printf("error reporting project Run err: %v.\n", reportErr)
 				}
-				return false, false, fmt.Errorf("error while running command: %v", err)
+				appliesPerProject[job.ProjectName] = false
+				if executorResult != nil {
+					exectorResults[i] = *executorResult
+				}
+				log.Printf("Project %v command %v failed, skipping job", job.ProjectName, command)
+				break
 			}
 			exectorResults[i] = *executorResult
 

cli/pkg/locking/locking.go

@@ -76,7 +76,7 @@ func (projectLock *PullRequestLock) Lock() (bool, error) {
 			comment := "Project " + projectLock.projectId() + " locked by another PR #" + transactionIdStr + " (failed to acquire lock " + projectLock.ProjectNamespace + "). The locking plan must be applied or discarded before future plans can execute"
 
 			reportLockingFailed(projectLock.Reporter, comment)
-			return false, nil
+			return false, fmt.Errorf(comment)
 		}
 	}
 	lockAcquired, err := projectLock.InternalLock.Lock(projectLock.PrNumber, lockId)
@@ -147,7 +147,7 @@ func (projectLock *PullRequestLock) verifyNoHangingLocks() (bool, error) {
 			transactionIdStr := strconv.Itoa(*transactionId)
 			comment := "Project " + projectLock.projectId() + " locked by another PR #" + transactionIdStr + "(failed to acquire lock " + projectLock.ProjectName + "). The locking plan must be applied or discarded before future plans can execute"
 			reportLockingFailed(projectLock.Reporter, comment)
-			return false, nil
+			return false, fmt.Errorf(comment)
 		}
 		return true, nil
 	}

cli/pkg/locking/locking_test.go

@@ -33,8 +33,7 @@ func TestLockingTwiceThrowsError(t *testing.T) {
 	}
 	state2, err2 := pl2.Lock()
 	assert.False(t, state2)
-	// No error because the lock was not acquired
-	assert.NoError(t, err2)
+	assert.Error(t, err2)
 }
 
 func TestGetLock(t *testing.T) {