fix remaining release-blocking job timeouts

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

@@ -154,7 +154,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h20m0s
   interval: 30m
   labels:
     preset-k8s-ssh: "true"
@@ -175,7 +175,7 @@ periodics:
       - --test_args=--ginkgo.focus=\[Feature:(AdmissionWebhookMatchConditions|InPlacePodVerticalScaling|StorageVersionAPI|PodPreset|StatefulSetAutoDeletePVC)\]|Networking
         --ginkgo.skip=\[Feature:(SCTPConnectivity|Volumes|Networking-Performance|Example)\]|IPv6|csi-hostpath-v0
         --minStartupPods=8
-      - --timeout=180m
+      - --timeout=120m
       command:
       - runner.sh
       - /workspace/scenarios/kubernetes_e2e.py
@@ -273,7 +273,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 1h20m0s
   interval: 30m
   labels:
     preset-k8s-ssh: "true"
@@ -288,7 +288,7 @@ periodics:
       - --gcp-region=us-central1
       - --provider=gce
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
-      - --timeout=180m
+      - --timeout=60m
       command:
       - runner.sh
       - /workspace/scenarios/kubernetes_e2e.py

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

@@ -10,7 +10,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 200m
+    timeout: 2h20m0s
   extra_refs:
   - base_ref: master
     org: kubernetes
@@ -29,7 +29,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest
-      - --timeout=180m
+      - --timeout=120m
       - --env=ENABLE_POD_PRIORITY=true
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -105,7 +105,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 200m
+    timeout: 1h20m0s
   extra_refs:
   - base_ref: master
     org: kubernetes
@@ -124,7 +124,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest
-      - --timeout=180m
+      - --timeout=60m
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
       command:
       - runner.sh

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

@@ -103,7 +103,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 2h30m0s
+    timeout: 1h0m0s
   extra_refs:
   - base_ref: release-1.33
     org: kubernetes
@@ -979,7 +979,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.33
     org: kubernetes
@@ -998,7 +998,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.33
-      - --timeout=180m
+      - --timeout=130m
       - --env=ENABLE_POD_PRIORITY=true
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1070,7 +1070,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.33
     org: kubernetes
@@ -1089,7 +1089,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.33
-      - --timeout=180m
+      - --timeout=130m
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
       command:
       - runner.sh

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

@@ -103,7 +103,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 2h30m0s
+    timeout: 1h0m0s
   extra_refs:
   - base_ref: release-1.34
     org: kubernetes
@@ -1254,7 +1254,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.34
     org: kubernetes
@@ -1273,7 +1273,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.34
-      - --timeout=180m
+      - --timeout=130m
       - --env=ENABLE_POD_PRIORITY=true
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1345,7 +1345,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.34
     org: kubernetes
@@ -1364,7 +1364,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.34
-      - --timeout=180m
+      - --timeout=130m
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
       command:
       - runner.sh

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

@@ -111,7 +111,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 2h30m0s
+    timeout: 1h0m0s
   extra_refs:
   - base_ref: release-1.35
     org: kubernetes
@@ -1374,7 +1374,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.35
     org: kubernetes
@@ -1393,7 +1393,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.35
-      - --timeout=180m
+      - --timeout=130m
       - --env=ENABLE_POD_PRIORITY=true
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1465,7 +1465,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.35
     org: kubernetes
@@ -1484,7 +1484,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.35
-      - --timeout=180m
+      - --timeout=130m
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
       command:
       - runner.sh

config/jobs/kubernetes/sig-release/release-branch-jobs/1.36.yaml

@@ -982,7 +982,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.36
     org: kubernetes
@@ -1001,7 +1001,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.36
-      - --timeout=180m
+      - --timeout=130m
       - --env=ENABLE_POD_PRIORITY=true
       - --env=KUBE_FEATURE_GATES=AllAlpha=true,AllBeta=true,EventedPLEG=false
       - --env=ENABLE_CACHE_MUTATION_DETECTOR=true
@@ -1075,7 +1075,7 @@ periodics:
   cluster: k8s-infra-prow-build
   decorate: true
   decoration_config:
-    timeout: 3h20m0s
+    timeout: 2h30m0s
   extra_refs:
   - base_ref: release-1.36
     org: kubernetes
@@ -1094,7 +1094,7 @@ periodics:
       - --gcp-region=us-central1
       - --gcp-node-image=gci
       - --extract=ci/latest-1.36
-      - --timeout=180m
+      - --timeout=130m
       - --test_args=--ginkgo.focus=\[Feature:Reboot\] --minStartupPods=8
       command:
       - runner.sh

config/tests/jobs/jobs_test.go

@@ -1210,23 +1210,6 @@ func TestClusterName(t *testing.T) {
 func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
 	jobsToFix := 0
 	numJobs := len(allStaticJobs())
-
-	// TODO: finish eliminating this list and remove the known-failures logic
-	knownFailures := map[string]bool{
-		"ci-kubernetes-e2e-gce-cos-alphafeatures-beta":    false,
-		"ci-kubernetes-e2e-gce-cos-alphafeatures-master":  false,
-		"ci-kubernetes-e2e-gce-cos-alphafeatures-stable1": false,
-		"ci-kubernetes-e2e-gce-cos-alphafeatures-stable2": false,
-		"ci-kubernetes-e2e-gce-cos-alphafeatures-stable3": false,
-		"ci-kubernetes-e2e-gce-cos-reboot-beta":           false,
-		"ci-kubernetes-e2e-gce-cos-reboot-master":         false,
-		"ci-kubernetes-e2e-gce-cos-reboot-stable1":        false,
-		"ci-kubernetes-e2e-gce-cos-reboot-stable2":        false,
-		"ci-kubernetes-e2e-gce-cos-reboot-stable3":        false,
-		"ci-kubernetes-e2e-gci-gce-alpha-features":        false,
-		"ci-kubernetes-e2e-gci-gce-reboot":                false,
-	}
-
 	for _, job := range c.AllPeriodics() {
 		// Only consider Pods that are release-blocking
 		if job.Spec == nil || !isKubernetesReleaseBlocking(job.JobBase) {
@@ -1259,12 +1242,7 @@ func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
 			jobsToFix++
 		}
 		for _, err := range errs {
-			if _, ok := knownFailures[job.Name]; ok {
-				t.Logf("%v: %v", job.Name, err)
-				knownFailures[job.Name] = true
-			} else {
-				t.Errorf("%v: %v", job.Name, err)
-			}
+			t.Errorf("%v: %v", job.Name, err)
 		}
 	}
 
@@ -1299,23 +1277,12 @@ func TestKubernetesReleaseBlockingJobsCIPolicy(t *testing.T) {
 				jobsToFix++
 			}
 			for _, err := range errs {
-				if _, ok := knownFailures[job.Name]; ok {
-					t.Logf("%v: %v", job.Name, err)
-					knownFailures[job.Name] = true
-				} else {
-					t.Errorf("%v: %v", job.Name, err)
-				}
+				t.Errorf("%v: %v", job.Name, err)
 			}
 		}
 	}
 
 	t.Logf("summary: %4d/%4d jobs fail to meet kubernetes/kubernetes release-blocking CI policy", jobsToFix, numJobs)
-
-	for name, stillFailing := range knownFailures {
-		if !stillFailing {
-			t.Errorf("%v: job is not failing anymore, remove it from knownFailures", name)
-		}
-	}
 }
 
 func kubernetesBranch(refs []prowapi.Refs) string {