From 4a42871fb34f7961759b794cf00d35c0e43353d6 Mon Sep 17 00:00:00 2001
From: Rael Garcia <rael@redhat.com>
Date: Wed, 25 Mar 2026 08:04:01 +0100
Subject: [PATCH] skip z-stream upgrade test for 4.19

The 4.19 z-stream upgrade test fails because Cincinnati returns
versions that the RP does not serve. Disable the 4.19 entry until
version filtering is implemented.
---
 test/e2e/control_plane_automated_z_stream_upgrade.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/e2e/control_plane_automated_z_stream_upgrade.go b/test/e2e/control_plane_automated_z_stream_upgrade.go
index b81fa45e2d7..3522318b195 100644
--- a/test/e2e/control_plane_automated_z_stream_upgrade.go
+++ b/test/e2e/control_plane_automated_z_stream_upgrade.go
@@ -41,6 +41,11 @@ var _ = Describe("Control plane automated z-stream upgrade with candidate channe
 				customerClusterNamePrefix        = "cluster-zstream-"
 			)
 
+			// TODO: remove once https://github.com/Azure/ARO-HCP/pull/4618 is merged
+			if version == "4.19" && time.Now().Before(time.Date(2026, 4, 1, 0, 0, 0, 0, time.UTC)) {
+				Skip("4.19 z-stream test temporarily skipped: Cincinnati returns versions the RP doesn't serve")
+			}
+
 			installVersion, hasUpgradePath, err := framework.GetInstallVersionForZStreamUpgrade(ctx, "candidate", version)
 			if err != nil {
 				if cincinatti.IsCincinnatiVersionNotFoundError(err) {