feat: limit builds to 3 separate attempts wo/ auto-retry (#110)

Co-authored-by: raphaelcoeffic <[email protected]>

Author: raphaelcoeffic

artifactory/artifactory.go

@@ -128,7 +128,6 @@ func (artifactory *Artifactory) restartFailedJob(
 		To:        WaitingForBuild,
 	})
 	job.Status = WaitingForBuild
-	job.BuildAttempts = 0
 
 	err := artifactory.BuildJobsRepository.Save(job)
 	if err != nil {
@@ -147,8 +146,8 @@ func (artifactory *Artifactory) CreateBuildJob(
 	}
 
 	if job != nil {
-		// forcibly restart completely failed build
-		if job.Status == BuildError {
+		// restart failed build until MaxBuildAttemps
+		if job.Status == BuildError && job.BuildAttempts < MaxBuildAttempts {
 			return artifactory.restartFailedJob(requesterIP, job)
 		}
 		return BuildJobDtoFromModel(job, artifactory.PrefixURL)
@@ -213,15 +212,11 @@ func (artifactory *Artifactory) Build(
 	})
 	onBuildFailure := func(err error, build *BuildJobModel) (*BuildJobModel, error) {
 		build.BuildEndedAt = time.Now()
-		newStatus := WaitingForBuild
-		if build.BuildAttempts >= MaxBuildAttempts {
-			newStatus = BuildError
-		}
-		build.Status = newStatus
+		build.Status = BuildError
 
 		build.AuditLogs = append(build.AuditLogs, AuditLogModel{
 			From:      BuildInProgress,
-			To:        newStatus,
+			To:        BuildError,
 			CreatedAt: time.Now(),
 			StdOut:    recorder.Logs(),
 		})

artifactory/artifactory_test.go

@@ -190,7 +190,7 @@ func TestCreatesBuildJobWhenBuildExistsInErrorState(t *testing.T) {
 	assert.NotNil(t, model)
 
 	if model != nil {
-		assert.Equal(t, artifactory.WaitingForBuild, model.Status)
+		assert.Equal(t, artifactory.BuildError, model.Status)
 		assert.Equal(t, request.HashTargetAndFlags(), model.BuildFlagsHash)
 	}
 }
@@ -288,7 +288,7 @@ func TestBuildWhenFailingToDownload(t *testing.T) {
 	assert.Error(t, err, "failed to download")
 	downloader.AssertNumberOfCalls(t, "Download", 1)
 	assert.Equal(t, model1.ID.String(), model2.ID.String())
-	assert.Equal(t, artifactory.WaitingForBuild, model2.Status)
+	assert.Equal(t, artifactory.BuildError, model2.Status)
 	assert.Equal(t, int64(1), model2.BuildAttempts)
 }
 
@@ -313,7 +313,7 @@ func TestBuildWhenFailingToBuild(t *testing.T) {
 	downloader.AssertNumberOfCalls(t, "Download", 1)
 	builder.AssertNumberOfCalls(t, "Build", 1)
 	assert.Equal(t, model1.ID.String(), model2.ID.String())
-	assert.Equal(t, artifactory.WaitingForBuild, model2.Status)
+	assert.Equal(t, artifactory.BuildError, model2.Status)
 	assert.Equal(t, int64(1), model2.BuildAttempts)
 }
 
@@ -342,7 +342,7 @@ func TestBuildWhenFailingToUpload(t *testing.T) {
 	assert.Error(t, err, "failed to upload")
 
 	assert.Equal(t, model1.ID.String(), model2.ID.String())
-	assert.Equal(t, artifactory.WaitingForBuild, model2.Status)
+	assert.Equal(t, artifactory.BuildError, model2.Status)
 	assert.Equal(t, int64(1), model2.BuildAttempts)
 }
 

artifactory/model.go

@@ -22,7 +22,7 @@ const (
 type BuildErrorType string
 
 const (
-	MaxBuildAttempts = 5
+	MaxBuildAttempts = 3
 	MaxBuildDuration = time.Minute * 15
 )