Skip to content

ci-operator: record aggregate error instead last one #2655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
petr-muller wants to merge 1 commit into from
Closed

ci-operator: record aggregate error instead last one #2655

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pkg/steps/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/wait"
prowv1 "k8s.io/test-infra/prow/apis/prowjobs/v1"
"k8s.io/test-infra/prow/clonerefs"
Expand Down Expand Up @@ -369,21 +370,22 @@ func isBuildPhaseTerminated(phase buildapi.BuildPhase) bool {
}

func handleBuild(ctx context.Context, buildClient BuildClient, build *buildapi.Build) error {
var buildErr error
var buildErrs []error
attempts := 5
if boErr := wait.ExponentialBackoff(wait.Backoff{Duration: time.Minute, Factor: 1.5, Steps: attempts}, func() (bool, error) {
if err := buildClient.Create(ctx, build); err != nil && !kerrors.IsAlreadyExists(err) {
return false, fmt.Errorf("could not create build %s: %w", build.Name, err)
}

buildErr = waitForBuildOrTimeout(ctx, buildClient, build.Namespace, build.Name)
buildErr := waitForBuildOrTimeout(ctx, buildClient, build.Namespace, build.Name)
if buildErr == nil {
if err := gatherSuccessfulBuildLog(buildClient, build.Namespace, build.Name); err != nil {
// log error but do not fail successful build
logrus.WithError(err).Warnf("Failed gathering successful build %s logs into artifacts.", build.Name)
}
return true, nil
}
buildErrs = append(buildErrs, buildErr)

b := &buildapi.Build{}
if err := buildClient.Get(ctx, ctrlruntimeclient.ObjectKey{Namespace: build.Namespace, Name: build.Name}, b); err != nil {
Expand Down Expand Up @@ -415,7 +417,7 @@ func handleBuild(ctx context.Context, buildClient BuildClient, build *buildapi.B
return false, nil
}); boErr != nil {
if boErr == wait.ErrWaitTimeout {
return fmt.Errorf("build not successful after %d attempts, last error: %w", attempts, buildErr)
return fmt.Errorf("build not successful after %d attempts: %w", attempts, errors.NewAggregate(buildErrs))
}
return boErr
}
Expand Down