Skip to content

Commit 93eda0c

Browse files
authored
Increaset job timeout for openshift-sandboxed-containers workflows (#71161)
* ci-operator.config.osc: Increase job timeout we're hitting 4h timeout when running manual suite via cucushift-installer-wait. Increase the default timeout to 24h Signed-off-by: Lukáš Doktor <[email protected]> * ci-operator.step: Move cucushift-installer-wait to test phase in case cucushift-installer-wait fails the consequent cleanup steps are not executed and the cloud cleanup is not performed, leaving resources behind. Move it to test-phase ensures the cleanup should be executed. There is one drawback, failed "e2e" execution results in skipped cucushift-installer-wait. This shouldn't be often a problem as we only fail on infra error, not on test fail. Signed-off-by: Lukáš Doktor <[email protected]> * ci-operator.step: Limit cucushift-installer-wait to 12h we only want to allow 12h reservation. Signed-off-by: Lukáš Doktor <[email protected]> --------- Signed-off-by: Lukáš Doktor <[email protected]>
1 parent 7c56fcd commit 93eda0c

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed

ci-operator/config/openshift/sandboxed-containers-operator/openshift-sandboxed-containers-operator-devel__downstream-candidate.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ tests:
3838
TEST_SCENARIOS: sig-kata.*Kata Author
3939
TEST_TIMEOUT: "75"
4040
workflow: sandboxed-containers-operator-e2e-azure
41+
timeout: 24h0m0s
4142
- as: azure-ipi-peerpods
4243
cron: 0 0 31 2 1
4344
steps:
@@ -58,6 +59,7 @@ tests:
5859
TEST_TIMEOUT: "75"
5960
WORKLOAD_TO_TEST: peer-pods
6061
workflow: sandboxed-containers-operator-e2e-azure
62+
timeout: 24h0m0s
6163
- as: azure-ipi-coco
6264
cron: 0 0 31 2 1
6365
steps:
@@ -82,6 +84,7 @@ tests:
8284
TRUSTEE_CATALOG_SOURCE_NAME: trustee-catalog
8385
WORKLOAD_TO_TEST: coco
8486
workflow: sandboxed-containers-operator-e2e-azure
87+
timeout: 24h0m0s
8588
- as: aws-ipi-peerpods
8689
cron: 0 0 31 2 1
8790
steps:
@@ -104,6 +107,7 @@ tests:
104107
TEST_TIMEOUT: "75"
105108
WORKLOAD_TO_TEST: peer-pods
106109
workflow: sandboxed-containers-operator-e2e-aws
110+
timeout: 24h0m0s
107111
- as: aws-ipi-coco
108112
cron: 0 0 31 2 1
109113
steps:
@@ -128,6 +132,7 @@ tests:
128132
TRUSTEE_CATALOG_SOURCE_NAME: trustee-catalog
129133
WORKLOAD_TO_TEST: coco
130134
workflow: sandboxed-containers-operator-e2e-aws
135+
timeout: 24h0m0s
131136
zz_generated_metadata:
132137
branch: devel
133138
org: openshift

ci-operator/config/openshift/sandboxed-containers-operator/openshift-sandboxed-containers-operator-devel__downstream-release.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ tests:
3434
TEST_SCENARIOS: sig-kata.*Kata Author
3535
TEST_TIMEOUT: "75"
3636
workflow: sandboxed-containers-operator-e2e-azure
37+
timeout: 24h0m0s
3738
- as: azure-ipi-peerpods
3839
cron: 0 0 31 2 1
3940
steps:
@@ -52,6 +53,7 @@ tests:
5253
TEST_TIMEOUT: "75"
5354
WORKLOAD_TO_TEST: peer-pods
5455
workflow: sandboxed-containers-operator-e2e-azure
56+
timeout: 24h0m0s
5557
- as: azure-ipi-coco
5658
cron: 0 0 31 2 1
5759
steps:
@@ -70,6 +72,7 @@ tests:
7072
TEST_TIMEOUT: "75"
7173
WORKLOAD_TO_TEST: coco
7274
workflow: sandboxed-containers-operator-e2e-azure
75+
timeout: 24h0m0s
7376
- as: aws-ipi-peerpods
7477
cron: 0 0 31 2 1
7578
steps:
@@ -88,6 +91,7 @@ tests:
8891
TEST_TIMEOUT: "75"
8992
WORKLOAD_TO_TEST: peer-pods
9093
workflow: sandboxed-containers-operator-e2e-aws
94+
timeout: 24h0m0s
9195
- as: aws-ipi-coco
9296
cron: 0 0 31 2 1
9397
steps:
@@ -106,6 +110,7 @@ tests:
106110
TEST_TIMEOUT: "75"
107111
WORKLOAD_TO_TEST: coco
108112
workflow: sandboxed-containers-operator-e2e-aws
113+
timeout: 24h0m0s
109114
zz_generated_metadata:
110115
branch: devel
111116
org: openshift

ci-operator/step-registry/sandboxed-containers-operator/create-prowjob/sandboxed-containers-operator-create-prowjob-commands.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ tests:
387387
TRUSTEE_CATALOG_SOURCE_IMAGE: ${TRUSTEE_CATALOG_SOURCE_IMAGE}
388388
TRUSTEE_CATALOG_SOURCE_NAME: ${TRUSTEE_CATALOG_SOURCE_NAME}
389389
workflow: sandboxed-containers-operator-e2e-azure
390+
timeout: 24h0m0s
390391
- as: azure-ipi-peerpods
391392
cron: 0 0 31 2 1
392393
steps:
@@ -413,6 +414,7 @@ tests:
413414
TRUSTEE_CATALOG_SOURCE_NAME: ${TRUSTEE_CATALOG_SOURCE_NAME}
414415
WORKLOAD_TO_TEST: peer-pods
415416
workflow: sandboxed-containers-operator-e2e-azure
417+
timeout: 24h0m0s
416418
- as: azure-ipi-coco
417419
cron: 0 0 31 2 1
418420
steps:
@@ -439,6 +441,7 @@ tests:
439441
TRUSTEE_CATALOG_SOURCE_NAME: ${TRUSTEE_CATALOG_SOURCE_NAME}
440442
WORKLOAD_TO_TEST: coco
441443
workflow: sandboxed-containers-operator-e2e-azure
444+
timeout: 24h0m0s
442445
- as: aws-ipi-peerpods
443446
cron: 0 0 31 2 1
444447
steps:
@@ -464,6 +467,7 @@ tests:
464467
TRUSTEE_CATALOG_SOURCE_NAME: ${TRUSTEE_CATALOG_SOURCE_NAME}
465468
WORKLOAD_TO_TEST: peer-pods
466469
workflow: sandboxed-containers-operator-e2e-aws
470+
timeout: 24h0m0s
467471
- as: aws-ipi-coco
468472
cron: 0 0 31 2 1
469473
steps:
@@ -489,6 +493,7 @@ tests:
489493
TRUSTEE_CATALOG_SOURCE_NAME: ${TRUSTEE_CATALOG_SOURCE_NAME}
490494
WORKLOAD_TO_TEST: coco
491495
workflow: sandboxed-containers-operator-e2e-aws
496+
timeout: 24h0m0s
492497
zz_generated_metadata:
493498
branch: devel
494499
org: openshift

ci-operator/step-registry/sandboxed-containers-operator/e2e/aws/sandboxed-containers-operator-e2e-aws-workflow.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ workflow:
2121
- chain: sandboxed-containers-operator-pre
2222
post:
2323
- ref: sandboxed-containers-operator-gather-must-gather
24-
- ref: cucushift-installer-wait
2524
- ref: sandboxed-containers-operator-post
2625
- chain: ipi-aws-post
2726
test:
2827
- ref: openshift-extended-test
28+
- ref: cucushift-installer-wait
29+
timeout: 12h10m0s
2930
documentation: |-
3031
This workflow run openshift-extented-test on an AWS cluster with
3132
the sandboxed containers deployed.

ci-operator/step-registry/sandboxed-containers-operator/e2e/azure/sandboxed-containers-operator-e2e-azure-workflow.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ workflow:
1414
- chain: sandboxed-containers-operator-pre
1515
post:
1616
- ref: sandboxed-containers-operator-gather-must-gather
17-
- ref: cucushift-installer-wait
1817
- chain: ipi-azure-post
1918
test:
2019
- ref: openshift-extended-test
20+
- ref: cucushift-installer-wait
21+
timeout: 12h10m0s
2122
documentation: |-
2223
This workflow run openshift-extented-test on an Azure cluster with
2324
the sandboxed containers deployed.

0 commit comments

Comments
 (0)