Skip to content

Commit e563978

Browse files
jacobseebertinatto
authored andcommitted
UPSTREAM: <drop>: temporarily move past failing tests
1 parent 12098e6 commit e563978

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

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

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ import (
77

88
// filterOutDisabledSpecs returns the specs with those that are disabled removed from the list
99
func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
10-
var disabledByReason = map[string][]string{
10+
disabledByReason := map[string][]string{
1111
"Alpha": { // alpha features that are not gated
1212
"[Feature:StorageVersionAPI]",
1313
"[Feature:ClusterTrustBundle]",
14-
"[Feature:DynamicResourceAllocation]",
1514
"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27
1615
// 4.19
17-
"[Feature:PodLevelResources]",
1816
"[Feature:PodLogsQuerySplitStreams]",
1917
// 4.20
2018
"[Feature:CBOR]",
@@ -159,6 +157,9 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
159157

160158
// https://issues.redhat.com/browse/OCPBUGS-45273
161159
"[sig-network] Services should implement NodePort and HealthCheckNodePort correctly when ExternalTrafficPolicy changes",
160+
161+
// https://issues.redhat.com/browse/OCPBUGS-61376
162+
"[sig-autoscaling] [Feature:HPA] Horizontal pod autoscaling",
162163
},
163164
// tests that need to be temporarily disabled while the rebase is in progress.
164165
"RebaseInProgress": {
@@ -170,6 +171,22 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
170171

171172
// https://issues.redhat.com/browse/OCPBUGS-17194
172173
"[sig-node] ImageCredentialProvider [Feature:KubeletCredentialProviders] should be able to create pod with image credentials fetched from external credential provider",
174+
175+
// Below this line is new for 1.34 rebase
176+
177+
// https://issues.redhat.com/browse/OCPBUGS-61515
178+
"[sig-scheduling] SchedulerPreemption [Serial] validates various priority Pods preempt expectedly with the async preemption [Feature:SchedulerAsyncPreemption] [FeatureGate:SchedulerAsyncPreemption] [Beta]",
179+
180+
// https://issues.redhat.com/browse/OCPBUGS-61377
181+
"[sig-cli] kubectl kuberc given preferences should be applied",
182+
"[sig-cli] kubectl kuberc given preferences should be ignored when flags are explicitly passed",
183+
184+
// https://issues.redhat.com/browse/OCPBUGS-61378
185+
"[sig-network] Conntrack should be able to cleanup conntrack entries when UDP service target port changes for a NodePort service",
186+
187+
// https://issues.redhat.com/browse/OCPBUGS-61381
188+
// We should not run v1beta{1,2} tests because we are not currently serving them, not even in TechPreviewNoUpgrade
189+
"[Feature:DynamicResourceAllocation] with v1beta",
173190
},
174191
// tests that may work, but we don't support them
175192
"Unsupported": {
@@ -184,6 +201,9 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
184201
"[sig-storage] In-tree Volumes [Driver: vsphere] [Testpattern: Dynamic PV (delayed binding)] topology should provision a volume and schedule a pod with AllowedTopologies",
185202
"[sig-storage] In-tree Volumes [Driver: vsphere] [Testpattern: Dynamic PV (immediate binding)] topology should fail to schedule a pod which has topologies that conflict with AllowedTopologies",
186203
"[sig-storage] In-tree Volumes [Driver: vsphere] [Testpattern: Dynamic PV (immediate binding)] topology should provision a volume and schedule a pod with AllowedTopologies",
204+
205+
// May become conformance in 4.22+, will need to revisit per https://issues.redhat.com/browse/OCPBUGS-61380
206+
"[sig-network] Services should support named targetPorts that resolve to different ports on different endpoints",
187207
},
188208
// tests too slow to be part of conformance
189209
"Slow": {

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ func addEnvironmentSelectors(specs et.ExtensionTestSpecs) {
3535
// Just remove this check + notify the OCP storage team.
3636
specs.Select(et.NameContains("[Feature:SELinuxMountReadWriteOncePodOnly]")).
3737
Exclude(et.FeatureGateEnabled(string(features.SELinuxMount)))
38+
39+
// DynamicResourceAllocation is only enabled in Technology Preview clusters as of 1.34 rebase,
40+
// see https://issues.redhat.com/browse/OCPBUGS-61381 for context
41+
specs.Select(et.NameContains("[FeatureGate:DynamicResourceAllocation]")).
42+
Exclude(et.FeatureGateDisabled(string(features.DynamicResourceAllocation)))
43+
specs.Select(et.NameContains("[sig-node] [DRA]")).
44+
Exclude(et.FeatureGateDisabled(string(features.DynamicResourceAllocation)))
3845
}
3946

4047
// filterByPlatform is a helper function to do, simple, "NameContains" filtering on tests by platform

openshift-hack/test-kubernetes-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NETWORK_SKIPS="\[Skipped:Network/OVNKubernetes\]|\[Feature:Networking-IPv6\]|\[F
3131
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.
34-
COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|\[Feature:OffByDefault\]|${COMMON_SKIPS}"
34+
COMMON_SKIPS="\[OCPFeatureGate:VolumeGroupSnapshot\]|\[Feature:OffByDefault\]|\[DRA\]|${COMMON_SKIPS}"
3535

3636
case "${TEST_SUITE}" in
3737
serial)

0 commit comments

Comments
 (0)