Skip to content

Commit b290488

Browse files
ShaanveerSShaanveerS
committed
fix remaining release-blocking job timeouts
Signed-off-by: Shaanveer Singh <shaanver.singh@gmail.com>
1 parent e31e308 commit b290488

File tree

7 files changed

+30
-62
lines changed

7 files changed

+30
-62
lines changed

‎config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ periodics:
154154
cluster: k8s-infra-prow-build
155155
decorate: true
156156
decoration_config:
157-
timeout: 3h20m0s
157+
timeout: 2h20m0s
158158
interval: 30m
159159
labels:
160160
preset-k8s-ssh: "true"
@@ -175,7 +175,7 @@ periodics:
175175
- --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking
176176
--ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0
177177
--minStartupPods=8
178-
- --timeout=180m
178+
- --timeout=120m
179179
command:
180180
- runner.sh
181181
- /workspace/scenarios/kubernetes_e2e.py
@@ -273,7 +273,7 @@ periodics:
273273
cluster: k8s-infra-prow-build
274274
decorate: true
275275
decoration_config:
276-
timeout: 3h20m0s
276+
timeout: 1h20m0s
277277
interval: 30m
278278
labels:
279279
preset-k8s-ssh: "true"
@@ -288,7 +288,7 @@ periodics:
288288
- --gcp-region=us-central1
289289
- --provider=gce
290290
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
291-
- --timeout=180m
291+
- --timeout=60m
292292
command:
293293
- runner.sh
294294
- /workspace/scenarios/kubernetes_e2e.py

‎config/jobs/kubernetes/sig-release/gce-cos-e2e-master.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ periodics:
1010
cluster: k8s-infra-prow-build
1111
decorate: true
1212
decoration_config:
13-
timeout: 200m
13+
timeout: 2h20m0s
1414
extra_refs:
1515
- base_ref: master
1616
org: kubernetes
@@ -29,7 +29,7 @@ periodics:
2929
- --gcp-region=us-central1
3030
- --gcp-node-image=gci
3131
- --extract=ci/latest
32-
- --timeout=180m
32+
- --timeout=120m
3333
- --env=ENABLE_POD_PRIORITY=true
3434
- --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
3535
- --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -105,7 +105,7 @@ periodics:
105105
cluster: k8s-infra-prow-build
106106
decorate: true
107107
decoration_config:
108-
timeout: 200m
108+
timeout: 1h20m0s
109109
extra_refs:
110110
- base_ref: master
111111
org: kubernetes
@@ -124,7 +124,7 @@ periodics:
124124
- --gcp-region=us-central1
125125
- --gcp-node-image=gci
126126
- --extract=ci/latest
127-
- --timeout=180m
127+
- --timeout=60m
128128
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
129129
command:
130130
- runner.sh

‎config/jobs/kubernetes/sig-release/release-branch-jobs/1.32.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ periodics:
103103
cluster: k8s-infra-prow-build
104104
decorate: true
105105
decoration_config:
106-
timeout: 2h30m0s
106+
timeout: 1h0m0s
107107
extra_refs:
108108
- base_ref: release-1.32
109109
org: kubernetes
@@ -733,7 +733,7 @@ periodics:
733733
cluster: k8s-infra-prow-build
734734
decorate: true
735735
decoration_config:
736-
timeout: 3h20m0s
736+
timeout: 2h30m0s
737737
extra_refs:
738738
- base_ref: release-1.32
739739
org: kubernetes
@@ -752,7 +752,7 @@ periodics:
752752
- --gcp-region=us-central1
753753
- --gcp-node-image=gci
754754
- --extract=ci/latest-1.32
755-
- --timeout=180m
755+
- --timeout=130m
756756
- --env=ENABLE_POD_PRIORITY=true
757757
- --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
758758
- --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -822,7 +822,7 @@ periodics:
822822
cluster: k8s-infra-prow-build
823823
decorate: true
824824
decoration_config:
825-
timeout: 3h20m0s
825+
timeout: 2h30m0s
826826
extra_refs:
827827
- base_ref: release-1.32
828828
org: kubernetes
@@ -841,7 +841,7 @@ periodics:
841841
- --gcp-region=us-central1
842842
- --gcp-node-image=gci
843843
- --extract=ci/latest-1.32
844-
- --timeout=180m
844+
- --timeout=130m
845845
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
846846
command:
847847
- runner.sh

‎config/jobs/kubernetes/sig-release/release-branch-jobs/1.33.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ periodics:
103103
cluster: k8s-infra-prow-build
104104
decorate: true
105105
decoration_config:
106-
timeout: 2h30m0s
106+
timeout: 1h0m0s
107107
extra_refs:
108108
- base_ref: release-1.33
109109
org: kubernetes
@@ -979,7 +979,7 @@ periodics:
979979
cluster: k8s-infra-prow-build
980980
decorate: true
981981
decoration_config:
982-
timeout: 3h20m0s
982+
timeout: 2h30m0s
983983
extra_refs:
984984
- base_ref: release-1.33
985985
org: kubernetes
@@ -998,7 +998,7 @@ periodics:
998998
- --gcp-region=us-central1
999999
- --gcp-node-image=gci
10001000
- --extract=ci/latest-1.33
1001-
- --timeout=180m
1001+
- --timeout=130m
10021002
- --env=ENABLE_POD_PRIORITY=true
10031003
- --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
10041004
- --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1070,7 +1070,7 @@ periodics:
10701070
cluster: k8s-infra-prow-build
10711071
decorate: true
10721072
decoration_config:
1073-
timeout: 3h20m0s
1073+
timeout: 2h30m0s
10741074
extra_refs:
10751075
- base_ref: release-1.33
10761076
org: kubernetes
@@ -1089,7 +1089,7 @@ periodics:
10891089
- --gcp-region=us-central1
10901090
- --gcp-node-image=gci
10911091
- --extract=ci/latest-1.33
1092-
- --timeout=180m
1092+
- --timeout=130m
10931093
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
10941094
command:
10951095
- runner.sh

‎config/jobs/kubernetes/sig-release/release-branch-jobs/1.34.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ periodics:
103103
cluster: k8s-infra-prow-build
104104
decorate: true
105105
decoration_config:
106-
timeout: 2h30m0s
106+
timeout: 1h0m0s
107107
extra_refs:
108108
- base_ref: release-1.34
109109
org: kubernetes
@@ -1254,7 +1254,7 @@ periodics:
12541254
cluster: k8s-infra-prow-build
12551255
decorate: true
12561256
decoration_config:
1257-
timeout: 3h20m0s
1257+
timeout: 2h30m0s
12581258
extra_refs:
12591259
- base_ref: release-1.34
12601260
org: kubernetes
@@ -1273,7 +1273,7 @@ periodics:
12731273
- --gcp-region=us-central1
12741274
- --gcp-node-image=gci
12751275
- --extract=ci/latest-1.34
1276-
- --timeout=180m
1276+
- --timeout=130m
12771277
- --env=ENABLE_POD_PRIORITY=true
12781278
- --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
12791279
- --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1345,7 +1345,7 @@ periodics:
13451345
cluster: k8s-infra-prow-build
13461346
decorate: true
13471347
decoration_config:
1348-
timeout: 3h20m0s
1348+
timeout: 2h30m0s
13491349
extra_refs:
13501350
- base_ref: release-1.34
13511351
org: kubernetes
@@ -1364,7 +1364,7 @@ periodics:
13641364
- --gcp-region=us-central1
13651365
- --gcp-node-image=gci
13661366
- --extract=ci/latest-1.34
1367-
- --timeout=180m
1367+
- --timeout=130m
13681368
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
13691369
command:
13701370
- runner.sh

‎config/jobs/kubernetes/sig-release/release-branch-jobs/1.35.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ periodics:
111111
cluster: k8s-infra-prow-build
112112
decorate: true
113113
decoration_config:
114-
timeout: 2h30m0s
114+
timeout: 1h0m0s
115115
extra_refs:
116116
- base_ref: release-1.35
117117
org: kubernetes
@@ -1374,7 +1374,7 @@ periodics:
13741374
cluster: k8s-infra-prow-build
13751375
decorate: true
13761376
decoration_config:
1377-
timeout: 3h20m0s
1377+
timeout: 2h30m0s
13781378
extra_refs:
13791379
- base_ref: release-1.35
13801380
org: kubernetes
@@ -1393,7 +1393,7 @@ periodics:
13931393
- --gcp-region=us-central1
13941394
- --gcp-node-image=gci
13951395
- --extract=ci/latest-1.35
1396-
- --timeout=180m
1396+
- --timeout=130m
13971397
- --env=ENABLE_POD_PRIORITY=true
13981398
- --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
13991399
- --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1465,7 +1465,7 @@ periodics:
14651465
cluster: k8s-infra-prow-build
14661466
decorate: true
14671467
decoration_config:
1468-
timeout: 3h20m0s
1468+
timeout: 2h30m0s
14691469
extra_refs:
14701470
- base_ref: release-1.35
14711471
org: kubernetes
@@ -1484,7 +1484,7 @@ periodics:
14841484
- --gcp-region=us-central1
14851485
- --gcp-node-image=gci
14861486
- --extract=ci/latest-1.35
1487-
- --timeout=180m
1487+
- --timeout=130m
14881488
- --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
14891489
command:
14901490
- runner.sh

‎config/tests/jobs/jobs_test.go‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,22 +1211,6 @@ func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
12111211
jobsToFix := 0
12121212
numJobs := len(allStaticJobs())
12131213

1214-
// TODO: finish eliminating this list and remove the known-failures logic
1215-
knownFailures := map[string]bool{
1216-
"ci-kubernetes-e2e-gce-cos-alphafeatures-master": false,
1217-
"ci-kubernetes-e2e-gce-cos-alphafeatures-stable1": false,
1218-
"ci-kubernetes-e2e-gce-cos-alphafeatures-stable2": false,
1219-
"ci-kubernetes-e2e-gce-cos-alphafeatures-stable3": false,
1220-
"ci-kubernetes-e2e-gce-cos-alphafeatures-stable4": false,
1221-
"ci-kubernetes-e2e-gce-cos-reboot-master": false,
1222-
"ci-kubernetes-e2e-gce-cos-reboot-stable1": false,
1223-
"ci-kubernetes-e2e-gce-cos-reboot-stable2": false,
1224-
"ci-kubernetes-e2e-gce-cos-reboot-stable3": false,
1225-
"ci-kubernetes-e2e-gce-cos-reboot-stable4": false,
1226-
"ci-kubernetes-e2e-gci-gce-alpha-features": false,
1227-
"ci-kubernetes-e2e-gci-gce-reboot": false,
1228-
}
1229-
12301214
for _, job := range c.AllPeriodics() {
12311215
// Only consider Pods that are release-blocking
12321216
if job.Spec == nil || !isKubernetesReleaseBlocking(job.JobBase) {
@@ -1259,12 +1243,7 @@ func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
12591243
jobsToFix++
12601244
}
12611245
for _, err := range errs {
1262-
if _, ok := knownFailures[job.Name]; ok {
1263-
t.Logf("%v: %v", job.Name, err)
1264-
knownFailures[job.Name] = true
1265-
} else {
1266-
t.Errorf("%v: %v", job.Name, err)
1267-
}
1246+
t.Errorf("%v: %v", job.Name, err)
12681247
}
12691248
}
12701249

@@ -1299,23 +1278,12 @@ func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
12991278
jobsToFix++
13001279
}
13011280
for _, err := range errs {
1302-
if _, ok := knownFailures[job.Name]; ok {
1303-
t.Logf("%v: %v", job.Name, err)
1304-
knownFailures[job.Name] = true
1305-
} else {
1306-
t.Errorf("%v: %v", job.Name, err)
1307-
}
1281+
t.Errorf("%v: %v", job.Name, err)
13081282
}
13091283
}
13101284
}
13111285

13121286
t.Logf("summary: %4d/%4d jobs fail to meet kubernetes/kubernetes release-blocking CI policy", jobsToFix, numJobs)
1313-
1314-
for name, stillFailing := range knownFailures {
1315-
if !stillFailing {
1316-
t.Errorf("%v: job is not failing anymore, remove it from knownFailures", name)
1317-
}
1318-
}
13191287
}
13201288

13211289
func kubernetesBranch(refs []prowapi.Refs) string {

0 commit comments

Comments
 (0)