From 832e000ab702b7bf3177e170bd9bfb1d660ed385 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Thu, 22 Aug 2024 18:44:14 +0530 Subject: [PATCH] fix unit test --- .../driverconfig/powerflex/v2.11.0/upgrade-path.yaml | 2 +- .../driverconfig/powermax/v2.11.0/upgrade-path.yaml | 2 +- .../driverconfig/powerscale/v2.11.0/upgrade-path.yaml | 2 +- .../driverconfig/powerstore/v2.11.0/upgrade-path.yaml | 2 +- operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml | 2 +- .../driverconfig/unity/{v2.9.1 => v2.9.2}/controller.yaml | 0 .../driverconfig/unity/{v2.9.1 => v2.9.2}/csidriver.yaml | 0 .../unity/{v2.9.1 => v2.9.2}/driver-config-params.yaml | 0 .../driverconfig/unity/{v2.9.1 => v2.9.2}/node.yaml | 0 .../driverconfig/unity/{v2.9.1 => v2.9.2}/upgrade-path.yaml | 0 tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml | 2 +- .../config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml | 2 +- .../config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml | 2 +- tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml | 2 +- tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml | 4 ++-- tests/shared/common.go | 4 ++-- 16 files changed, 13 insertions(+), 13 deletions(-) rename operatorconfig/driverconfig/unity/{v2.9.1 => v2.9.2}/controller.yaml (100%) rename operatorconfig/driverconfig/unity/{v2.9.1 => v2.9.2}/csidriver.yaml (100%) rename operatorconfig/driverconfig/unity/{v2.9.1 => v2.9.2}/driver-config-params.yaml (100%) rename operatorconfig/driverconfig/unity/{v2.9.1 => v2.9.2}/node.yaml (100%) rename operatorconfig/driverconfig/unity/{v2.9.1 => v2.9.2}/upgrade-path.yaml (100%) diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml index 529a9668d..6768c3552 100644 --- a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.2 diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/operatorconfig/driverconfig/unity/v2.9.1/controller.yaml b/operatorconfig/driverconfig/unity/v2.9.2/controller.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.9.1/controller.yaml rename to operatorconfig/driverconfig/unity/v2.9.2/controller.yaml diff --git a/operatorconfig/driverconfig/unity/v2.9.1/csidriver.yaml b/operatorconfig/driverconfig/unity/v2.9.2/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.9.1/csidriver.yaml rename to operatorconfig/driverconfig/unity/v2.9.2/csidriver.yaml diff --git a/operatorconfig/driverconfig/unity/v2.9.1/driver-config-params.yaml b/operatorconfig/driverconfig/unity/v2.9.2/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.9.1/driver-config-params.yaml rename to operatorconfig/driverconfig/unity/v2.9.2/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/unity/v2.9.1/node.yaml b/operatorconfig/driverconfig/unity/v2.9.2/node.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.9.1/node.yaml rename to operatorconfig/driverconfig/unity/v2.9.2/node.yaml diff --git a/operatorconfig/driverconfig/unity/v2.9.1/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.9.2/upgrade-path.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.9.1/upgrade-path.yaml rename to operatorconfig/driverconfig/unity/v2.9.2/upgrade-path.yaml diff --git a/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml +++ b/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml +++ b/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml index fd1516286..18b6b4b70 100644 --- a/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -13,4 +13,4 @@ # limitations under the License. # # -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml index 529a9668d..9c02efc7d 100644 --- a/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -1 +1 @@ -minUpgradePath: v2.9.0 +minUpgradePath: v2.9.1 diff --git a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml index 050b3c013..359d5565b 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml @@ -16,13 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.9.0 + configVersion: v2.9.2 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.9.0" + image: "dellemc/csi-vxflexos:v2.9.2" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT diff --git a/tests/shared/common.go b/tests/shared/common.go index 2142efd89..d388242f8 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -30,9 +30,9 @@ const ( PFlexConfigVersion string = "v2.11.0" DowngradeConfigVersion string = "v2.10.1" ConfigVersion string = "v2.10.1" - UpgradeConfigVersion string = "v2.9.0" + UpgradeConfigVersion string = "v2.9.1" JumpUpgradeConfigVersion string = "v2.11.0" - JumpDowngradeConfigVersion string = "v2.10.0" + JumpDowngradeConfigVersion string = "v2.10.1" OldConfigVersion string = "v2.2.0" BadConfigVersion string = "v0" PStoreConfigVersion string = "v2.11.0"