From 772504025c4097f2009ea267287bb1d56c53ac8f Mon Sep 17 00:00:00 2001 From: Daniel Fajmon Date: Thu, 29 Jan 2026 16:38:42 +0100 Subject: [PATCH 1/2] UPSTREAM: : Disable AZURE blobdisk tests https://github.com/kubernetes/kubernetes/issues/129007 --- .../azure/azure_blobDiskController_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController_test.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController_test.go index dc6a1a16460fc..29f28792d0d06 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController_test.go +++ b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_blobDiskController_test.go @@ -77,6 +77,8 @@ func TestInitStorageAccounts(t *testing.T) { } func TestCreateVolume(t *testing.T) { + // https://github.com/kubernetes/kubernetes/issues/129007 + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) @@ -111,6 +113,7 @@ func TestCreateVolume(t *testing.T) { } func TestDeleteVolume(t *testing.T) { + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) @@ -150,6 +153,7 @@ func TestDeleteVolume(t *testing.T) { } func TestCreateVHDBlobDisk(t *testing.T) { + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) @@ -194,6 +198,7 @@ func TestGetAllStorageAccounts(t *testing.T) { } func TestEnsureDefaultContainer(t *testing.T) { + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) @@ -233,6 +238,7 @@ func TestEnsureDefaultContainer(t *testing.T) { } func TestGetDiskCount(t *testing.T) { + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) @@ -332,6 +338,7 @@ func TestFindSANameForDisk(t *testing.T) { } func TestCreateBlobDisk(t *testing.T) { + t.Skip("skipping test due some Azure API changes and failing ci") ctrl := gomock.NewController(t) defer ctrl.Finish() b := GetTestBlobDiskController(t) From 5feffefc9a2ba4392d4f033ae9306f98c15c51b2 Mon Sep 17 00:00:00 2001 From: Daniel Fajmon Date: Thu, 22 Jan 2026 16:38:20 +0100 Subject: [PATCH 2/2] UPSTREAM: : Skip e2e test: attach on previously attached volumes should work This test was never used and has been deprecated in versions 4.18 and later. --- .../e2e/annotate/generated/zz_generated.annotations.go | 2 +- openshift-hack/e2e/annotate/rules.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go index f1e49c19aec4f..b188a7b2a941e 100644 --- a/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go +++ b/openshift-hack/e2e/annotate/generated/zz_generated.annotations.go @@ -13851,7 +13851,7 @@ var Annotations = map[string]string{ "[sig-storage] PersistentVolumes:vsphere [Feature:vsphere] should test that deleting the PV before the pod does not cause pod deletion to fail on vsphere volume detach": " [Disabled:Unsupported] [Suite:k8s]", - "[sig-storage] Pod Disks [Feature:StorageProvider] [Serial] attach on previously attached volumes should work": " [Skipped:NoOptionalCapabilities] [Suite:openshift/conformance/serial] [Suite:k8s]", + "[sig-storage] Pod Disks [Feature:StorageProvider] [Serial] attach on previously attached volumes should work": " [Disabled:Broken] [Skipped:NoOptionalCapabilities] [Suite:k8s]", "[sig-storage] Pod Disks [Feature:StorageProvider] detach in a disrupted environment [Slow] [Disruptive] when node's API object is deleted": " [Serial] [Skipped:NoOptionalCapabilities] [Suite:k8s]", diff --git a/openshift-hack/e2e/annotate/rules.go b/openshift-hack/e2e/annotate/rules.go index 224551edc0a1d..0416532fd40f4 100644 --- a/openshift-hack/e2e/annotate/rules.go +++ b/openshift-hack/e2e/annotate/rules.go @@ -136,6 +136,9 @@ var ( // https://bugzilla.redhat.com/show_bug.cgi?id=1953478 `\[sig-storage\] Dynamic Provisioning Invalid AWS KMS key should report an error and create no PV`, + + // https://issues.redhat.com/browse/OCPBUGS-72531 + `\[sig-storage\] Pod Disks \[Feature:StorageProvider\] \[Serial\] attach on previously attached volumes should work`, }, // tests that need to be temporarily disabled while the rebase is in progress. "[Disabled:RebaseInProgress]": {