From 9574fa881bc6e2840ebb135d49fef0c1c5c84b9a Mon Sep 17 00:00:00 2001 From: guangwu Date: Wed, 22 May 2024 15:11:53 +0800 Subject: [PATCH 1/2] cephfs: close dir Signed-off-by: guoguangwu --- internal/cephfs/nodeserver.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/cephfs/nodeserver.go b/internal/cephfs/nodeserver.go index abd71b219..22d78f3f9 100644 --- a/internal/cephfs/nodeserver.go +++ b/internal/cephfs/nodeserver.go @@ -393,6 +393,7 @@ func getBackingSnapshotRoot( return "", status.Errorf(codes.Internal, err.Error()) } + defer dir.Close() // Read the contents of /.snap directory into a string slice. From ce3ec6acbf639f9485ba63220329d07407713fa1 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Tue, 28 May 2024 16:17:50 +0530 Subject: [PATCH 2/2] ci: remove k8s 1.30 tests from release-v3.11 k8s 1.30 tests were excluded for release-v3.11 but merigfy had 1.30 tests conditions for release-v3.11. This commit remove the these conditions for v3.11. Signed-off-by: Praveen M --- .mergify.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 199d511c9..74c1d49b0 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -37,15 +37,12 @@ queue_rules: - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - "status-success=ci/centos/k8s-e2e-external-storage/1.28" - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - - "status-success=ci/centos/k8s-e2e-external-storage/1.30" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - "status-success=ci/centos/mini-e2e/k8s-1.27" - "status-success=ci/centos/mini-e2e/k8s-1.28" - "status-success=ci/centos/mini-e2e/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.30" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -193,15 +190,12 @@ pull_request_rules: - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - "status-success=ci/centos/k8s-e2e-external-storage/1.28" - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - - "status-success=ci/centos/k8s-e2e-external-storage/1.30" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - "status-success=ci/centos/mini-e2e/k8s-1.27" - "status-success=ci/centos/mini-e2e/k8s-1.28" - "status-success=ci/centos/mini-e2e/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.30" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -283,15 +277,12 @@ pull_request_rules: - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - "status-success=ci/centos/k8s-e2e-external-storage/1.28" - "status-success=ci/centos/k8s-e2e-external-storage/1.29" - - "status-success=ci/centos/k8s-e2e-external-storage/1.30" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - "status-success=ci/centos/mini-e2e-helm/k8s-1.28" - "status-success=ci/centos/mini-e2e-helm/k8s-1.29" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.30" - "status-success=ci/centos/mini-e2e/k8s-1.27" - "status-success=ci/centos/mini-e2e/k8s-1.28" - "status-success=ci/centos/mini-e2e/k8s-1.29" - - "status-success=ci/centos/mini-e2e/k8s-1.30" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO"