diff --git a/test/extended/machine_config/helpers.go b/test/extended/machine_config/helpers.go index 9962d3344f1b..af549082e867 100644 --- a/test/extended/machine_config/helpers.go +++ b/test/extended/machine_config/helpers.go @@ -150,33 +150,6 @@ func skipOnMetal(oc *exutil.CLI) { } } -// `isRHEL10` returns true if the desired MCP is targeting RHEL10. -func isRHEL10(machineConfigClient *machineconfigclient.Clientset, mcpName string) bool { - mcp, err := machineConfigClient.MachineconfigurationV1().MachineConfigPools().Get(context.TODO(), mcpName, metav1.GetOptions{}) - o.Expect(err).NotTo(o.HaveOccurred(), "Error getting MCPs.") - - if mcp.Spec.OSImageStream.Name == "rhel-10" { - return true - } - - return false -} - -// skipOnRHEL10BeforeMar11 skips the test if the desired MCP is targeting RHEL10 and the date is -// before March 11th. -func skipOnRHEL10BeforeMar11(machineConfigClient *machineconfigclient.Clientset, mcpName string) { - if isRHEL10(machineConfigClient, mcpName) { - // Check if the current date is before March 11, 2026. - now := time.Now() - targetDate := time.Date(now.Year(), time.March, 11, 0, 0, 0, 0, now.Location()) - if now.Before(targetDate) { - e2eskipper.Skipf("Skipping this test as MCP `%v` is targeting RHEL10.", mcpName) - } - // If the date is after March 11th, the test should start running on RHEL10 clusters again. - framework.Logf("Worker MCP is targeting RHEL10, but the date is after March 11th, so this test will run.") - } -} - // `isFeatureGateEnabled` checks if the desired feature gate provided as a parameter is enabled in // the test cluster. It returns true if the feature gate is enabled and false otherwise. func isFeatureGateEnabled(configClient configv1client.Interface, featureGate osconfigv1.FeatureGateName) bool { diff --git a/test/extended/machine_config/machine_config_node.go b/test/extended/machine_config/machine_config_node.go index 027a328d8a7b..896380dd1e25 100644 --- a/test/extended/machine_config/machine_config_node.go +++ b/test/extended/machine_config/machine_config_node.go @@ -78,15 +78,6 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:MachineConfigNodes]", func() { g.Skip("Skipping this test since this cluster has no machines in the worker MCP, so no custom MCP can be made.") } - // Due to current (as of Feb 16th) limitations in the dual-stream feature, custom MCPS - // always use the default OS image stream for a cluster, regardless of what is set as the - // desired stream for the worker MCP. This has led to OCPBUGS-76551, and all tests creating - // custom MCPs can face similar issues. To temorarily reduce failures in tests due to test - // environment setup instead of functionalty issues, tests creating custom MCPs will be - // skipped when dual streams has been used to set the cluster to RHEL10 and when the date - // is before March 11th. - skipOnRHEL10BeforeMar11(clientSet, worker) - ValidateMCNPropertiesCustomMCP(oc, infraMCPFixture) }) @@ -105,15 +96,6 @@ var _ = g.Describe("[sig-mco][OCPFeatureGate:MachineConfigNodes]", func() { // When the cluster has machines in the "worker" MCP, use a custom MCP to test the update if slices.Contains(poolNames, worker) { - // Due to current (as of Feb 16th) limitations in the dual-stream feature, custom MCPS - // always use the default OS image stream for a cluster, regardless of what is set as the - // desired stream for the worker MCP. This has led to OCPBUGS-76551, and all tests creating - // custom MCPs can face similar issues. To temorarily reduce failures in tests due to test - // environment setup instead of functionalty issues, tests creating custom MCPs will be - // skipped when dual streams has been used to set the cluster to RHEL10 and when the date - // is before March 11th. - skipOnRHEL10BeforeMar11(clientSet, worker) - framework.Logf("Validating MCN properties in custom MCP.") ValidateMCNConditionTransitionsOnRebootlessUpdate(oc, clientSet, nodeDisruptionFixture, nodeDisruptionEmptyFixture, customMCFixture, infraMCPFixture) } else { // When there are no machines in the "worker" MCP, test the update by applying a MC targeting the "master" MCP