diff --git a/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go b/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go index 87f900f1a5730..1c6b10fda49ab 100644 --- a/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go +++ b/openshift-hack/cmd/k8s-tests-ext/disabled_tests.go @@ -161,9 +161,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs { // https://issues.redhat.com/browse/OCPBUGS-45275 "[sig-network] Connectivity Pod Lifecycle should be able to connect to other Pod from a terminating Pod", - - // https://issues.redhat.com/browse/OCPBUGS-61376 - "[sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling", }, // tests that need to be temporarily disabled while the rebase is in progress. "RebaseInProgress": { @@ -212,8 +209,6 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs { // tests that are known flaky "Flaky": { "Job should run a job to completion when tasks sometimes fail and are not locally restarted", // seems flaky, also may require too many resources - // TODO(node): test works when run alone, but not in the suite in CI - "[Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) [sig-autoscaling] ReplicationController light Should scale from 1 pod to 2 pods", }, } diff --git a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go index bba776a8f5eba..1e05d49a671e1 100644 --- a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go +++ b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go @@ -160,6 +160,7 @@ func withExcludedTestsFilter(baseExpr string) string { "[Slow]", "[Flaky]", "[Local]", + "[Feature:HPA]", // We enable these tests through its own HPA prow job } filter := "" diff --git a/openshift-hack/cmd/k8s-tests-ext/labels.go b/openshift-hack/cmd/k8s-tests-ext/labels.go index 747f2db5f355c..63b86436a5f6c 100644 --- a/openshift-hack/cmd/k8s-tests-ext/labels.go +++ b/openshift-hack/cmd/k8s-tests-ext/labels.go @@ -17,8 +17,6 @@ func addLabelsToSpecs(specs et.ExtensionTestSpecs) { "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 - "[Feature:HPA] Horizontal pod autoscaling (scale resource: CPU) [sig-autoscaling] ReplicationController light Should scale from 1 pod to 2 pods", - "should prevent Ingress creation if more than 1 IngressClass marked as default", // https://bugzilla.redhat.com/show_bug.cgi?id=1822286 "[sig-network] IngressClass [Feature:Ingress] should set default value on new IngressClass", //https://bugzilla.redhat.com/show_bug.cgi?id=1833583 diff --git a/openshift-hack/test-kubernetes-e2e.sh b/openshift-hack/test-kubernetes-e2e.sh index 5157557d9d481..d8437bfa898f8 100755 --- a/openshift-hack/test-kubernetes-e2e.sh +++ b/openshift-hack/test-kubernetes-e2e.sh @@ -32,6 +32,8 @@ TEST_SUITE="${TEST_SUITE:-parallel}" COMMON_SKIPS="\[Slow\]|\[Disruptive\]|\[Flaky\]|\[Disabled:.+\]|\[Skipped:${PLATFORM}\]|${NETWORK_SKIPS}" # Skip tests for features that require a TechPreview cluster. TODO: Remove when the feature is enabled by default. COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|\[Feature:OffByDefault\]|\[DRA\]|${COMMON_SKIPS}" +# Skip HPA tests because they use a heavy resources in parallel and flake. There is a separate HPA prow job that runs these tests. +COMMON_SKIPS="${COMMON_SKIPS}|\[Feature:HPA\]" case "${TEST_SUITE}" in serial)