diff --git a/ci/ci-test.sh b/ci/ci-test.sh index 2dcdecfe6..63dc0b919 100755 --- a/ci/ci-test.sh +++ b/ci/ci-test.sh @@ -7,7 +7,7 @@ TEST_DIR="tests" # Prepare env for running BDD tests # Minikube is already running -helm install zfs-localpv ./deploy/helm/charts -n $OPENEBS_NAMESPACE --create-namespace --set zfsPlugin.pullPolicy=Never --set analytics.enabled=false +helm install zfs-localpv ./deploy/helm/charts -n $OPENEBS_NAMESPACE --create-namespace --set zfsPlugin.image.pullPolicy=Never --set analytics.enabled=false kubectl apply -f "$SNAP_CLASS" dumpAgentLogs() { diff --git a/tests/utils.go b/tests/utils.go index 696c8d2fb..9a5168aa2 100644 --- a/tests/utils.go +++ b/tests/utils.go @@ -130,11 +130,19 @@ func VerifyStorageClassParams(property map[string]string) { // Refer https://github.com/openebs/zfs-localpv/issues/560#issuecomment-2232535073 func generateThinProvisionParams(property map[string]string) { if property["fstype"] == "zfs" { - property["quota"] = capacity - property["reservation"] = defaultReservation - if property["thinprovision"] == "no" { - property["reservation"] = capacity + if property["quotatype"] == "quota" { + property["quota"] = string(capacity) + if property["thinprovision"] == "no" { + property["reservation"] = string(capacity) + } + } + if property["quotatype"] == "refquota" { + property["refquota"] = string(capacity) + if property["thinprovision"] == "no" { + property["refreservation"] = string(capacity) + } } + delete(property, "quotatype") } else { property["quota"] = "-" property["reservation"] = defaultReservation @@ -681,5 +689,18 @@ func getStoragClassParams() []map[string]string { "fstype": "xfs", "compression": "zstd-fast", }, + { + "fstype": "zfs", + "quotatype": "quota", + }, + { + "fstype": "zfs", + "quotatype": "refquota", + }, + { + "fstype": "zfs", + "thinprovision": "no", + "quotatype": "refquota", + }, } }