Skip to content

Commit f8ed9bb

Browse files
committed
UPSTREAM: <carry>: re-enable disabled HPA tests
This commit re-enables HPA tests by removing it from the disabled_tests.go specs. This also prevents HPA tests from running when using from the kubernetes/openshift OTE suites. They will now also be skipped by default when running the openshift-hack/test-kubernetes-e2e.sh script. This is because these tests use a ton of resources and flake in a high concurrency environment. Instead, a new HPA-only prow job will be configured to run these tests, with a lower concurrency. Signed-off-by: Max Cao <[email protected]>
1 parent 2fd6eed commit f8ed9bb

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

openshift-hack/cmd/k8s-tests-ext/disabled_tests.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
161161

162162
// https://issues.redhat.com/browse/OCPBUGS-45275
163163
"[sig-network] Connectivity Pod Lifecycle should be able to connect to other Pod from a terminating Pod",
164-
165-
// https://issues.redhat.com/browse/OCPBUGS-61376
166-
"[sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling",
167164
},
168165
// tests that need to be temporarily disabled while the rebase is in progress.
169166
"RebaseInProgress": {
@@ -212,8 +209,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
212209
// tests that are known flaky
213210
"Flaky": {
214211
"Job should run a job to completion when tasks sometimes fail and are not locally restarted", // seems flaky, also may require too many resources
215-
// TODO(node): test works when run alone, but not in the suite in CI
216-
"[Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) [sig-autoscaling] ReplicationController light Should scale from 1 pod to 2 pods",
217212
},
218213
}
219214

openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ func withExcludedTestsFilter(baseExpr string) string {
160160
"[Slow]",
161161
"[Flaky]",
162162
"[Local]",
163+
"[Feature:HPA]", // We enable these tests through its own HPA prow job
163164
}
164165

165166
filter := ""

openshift-hack/cmd/k8s-tests-ext/labels.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ func addLabelsToSpecs(specs et.ExtensionTestSpecs) {
1717

1818
"Should be able to support the 1.7 Sample API Server using the current Aggregator", // down apiservices break other clients today https://bugzilla.redhat.com/show_bug.cgi?id=1623195
1919

20-
"[Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) [sig-autoscaling] ReplicationController light Should scale from 1 pod to 2 pods",
21-
2220
"should prevent Ingress creation if more than 1 IngressClass marked as default", // https://bugzilla.redhat.com/show_bug.cgi?id=1822286
2321

2422
"[sig-network] IngressClass [Feature:Ingress] should set default value on new IngressClass", //https://bugzilla.redhat.com/show_bug.cgi?id=1833583

openshift-hack/test-kubernetes-e2e.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ TEST_SUITE="${TEST_SUITE:-parallel}"
3232
COMMON_SKIPS="\[Slow\]|\[Disruptive\]|\[Flaky\]|\[Disabled:.+\]|\[Skipped:${PLATFORM}\]|${NETWORK_SKIPS}"
3333
# Skip tests for features that require a TechPreview cluster. TODO: Remove when the feature is enabled by default.
3434
COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|\[Feature:OffByDefault\]|\[DRA\]|${COMMON_SKIPS}"
35+
# Skip HPA tests because they use a heavy resources in parallel and flake. There is a separate HPA prow job that runs these tests.
36+
COMMON_SKIPS="${COMMON_SKIPS}|\[Feature:HPA\]"
3537

3638
case "${TEST_SUITE}" in
3739
serial)

0 commit comments

Comments
 (0)