Skip to content

Increase timeouts for payload jobs to land k8s 1.31 #4246

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

Merged
openshift-merge-bot merged 1 commit into from
Aug 21, 2024
Merged

Increase timeouts for payload jobs to land k8s 1.31 #4246

Show file tree
Hide file tree
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
12 changes: 9 additions & 3 deletions pkg/controller/prpqr_reconciler/prpqr_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ const (
conditionAllJobsTriggered = "AllJobsTriggered"
conditionWithErrors = "WithErrors"

aggregationIDLabel = "release.openshift.io/aggregation-id"
defaultAggregatorJobTimeout = 6 * time.Hour
defaultMultiRefJobTimeout = 6 * time.Hour
aggregationIDLabel = "release.openshift.io/aggregation-id"
// TODO: temporarily increase timeout to allow payload tests to run during k8s rebase
defaultAggregatorJobTimeout = 8 * time.Hour
defaultMultiRefJobTimeout = 8 * time.Hour

dependentProwJobsFinalizer = "pullrequestpayloadqualificationruns.ci.openshift.io/dependent-prowjobs"
)
Expand Down Expand Up @@ -628,6 +629,11 @@ func generateProwjob(ciopConfig *api.ReleaseBuildConfiguration,
options.Cron = "@yearly"
})
periodic.Name = generateJobNameToSubmit(inject, prs)
// TODO: temporarily increase timeout to allow payload tests to run during k8s rebase
if periodic.DecorationConfig == nil {
periodic.DecorationConfig = &prowv1.DecorationConfig{}
}
periodic.DecorationConfig.Timeout = &prowv1.Duration{Duration: 6 * time.Hour}
break
}
// We did not find the injected test: this is a bug
Expand Down
4 changes: 3 additions & 1 deletion ...er/prpqr_reconciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_aggregated_case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
timeout: 8h0m0s
job: aggregator-periodic-ci-test-org-test-repo-test-branch-test-name
pod_spec:
containers:
Expand Down Expand Up @@ -120,6 +120,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down Expand Up @@ -205,6 +206,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
4 changes: 3 additions & 1 deletion ...ler/testdata/zz_fixture_prowjobs_TestReconcile_basic_aggregated_case_with_scheduling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
timeout: 8h0m0s
job: aggregator-periodic-ci-test-org-test-repo-test-branch-test-name
pod_spec:
containers:
Expand Down Expand Up @@ -120,6 +120,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down Expand Up @@ -205,6 +206,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions pkg/controller/prpqr_reconciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
2 changes: 1 addition & 1 deletion ...conciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case_with_cluster_override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
timeout: 8h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions ...reconciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case_with_metal_override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions ...pqr_reconciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case_with_scheduling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions .../prpqr_reconciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case_with_variant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions ...conciler/testdata/zz_fixture_prowjobs_TestReconcile_basic_case_with_vsphere_override.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions ...data/zz_fixture_prowjobs_TestReconcile_basic_case_without_PR__testing_specified_base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions .../zz_fixture_prowjobs_TestReconcile_multiple_case__one_of_the_prowjobs_already_exists.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
1 change: 1 addition & 0 deletions ...stdata/zz_fixture_prowjobs_TestReconcile_override_initial_and_base_payload_pullspecs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
cluster: cluster-name-overwritten
decoration_config:
skip_cloning: true
timeout: 6h0m0s
extra_refs:
- base_ref: test-branch
base_sha: "123456"
Expand Down
5 changes: 3 additions & 2 deletions pkg/jobrunaggregator/jobrunaggregatoranalyzer/analyzer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ func (o *JobRunAggregatorAnalyzerOptions) Run(ctx context.Context) error {

// the aggregator has a long time. The jobs it aggregates only have 4h (we think).
durationToWait := o.timeout - 20*time.Minute
if durationToWait > (5*time.Hour + 15*time.Minute) {
durationToWait = 5*time.Hour + 15*time.Minute
// TODO: temporary time change for payload testing during k8s rebase
if durationToWait > (7*time.Hour + 15*time.Minute) {
durationToWait = 7*time.Hour + 15*time.Minute
}
timeToStopWaiting := o.jobRunStartEstimate.Add(durationToWait)
alog := logrus.WithFields(logrus.Fields{
Expand Down