diff --git a/conf/README.md b/conf/README.md index 2380696842b3..b272d4180647 100644 --- a/conf/README.md +++ b/conf/README.md @@ -199,6 +199,7 @@ higher priority). * `skip_ocp_deployment` - Skip the OCP deployment step or not (Default: false) * `skip_ocs_deployment` - Skip the OCS deployment step or not (Default: false) * `ocs_version` - Version of OCS that is being deployed +* `acm_version` - Version of acm to be used for this run (applicable mostly to DR scenarios) * `vm_template` - VMWare template to use for RHCOS images * `fio_storageutilization_min_mbps` - Minimal write speed of FIO used in workload_fio_storageutilization * `TF_LOG_LEVEL` - Terraform log level diff --git a/ocs_ci/framework/pytest_customization/ocscilib.py b/ocs_ci/framework/pytest_customization/ocscilib.py index c8efcb441ab4..20ce8701a5be 100644 --- a/ocs_ci/framework/pytest_customization/ocscilib.py +++ b/ocs_ci/framework/pytest_customization/ocscilib.py @@ -262,6 +262,11 @@ def pytest_addoption(parser): "(e.g. quay.io/rhceph-dev/ocs-olm-operator:latest-4.3)" ), ) + parser.addoption( + "--acm-version", + dest="acm_version", + help="acm version(e.g. 2.8) to be used for the current run", + ) parser.addoption( "--upgrade-acm-version", dest="upgrade_acm_version", @@ -665,6 +670,9 @@ def process_cluster_cli_params(config): if custom_kubeconfig_location: os.environ["KUBECONFIG"] = custom_kubeconfig_location ocsci_config.RUN["kubeconfig"] = custom_kubeconfig_location + acm_version = get_cli_param(config, "--acm-version") + if acm_version: + ocsci_config.ENV_DATA["acm_version"] = acm_version upgrade_acm_version = get_cli_param(config, "--upgrade-acm-version") if upgrade_acm_version: ocsci_config.UPGRADE["upgrade_acm_version"] = upgrade_acm_version diff --git a/ocs_ci/utility/utils.py b/ocs_ci/utility/utils.py index 8db80111bd02..94e41fe6fd47 100644 --- a/ocs_ci/utility/utils.py +++ b/ocs_ci/utility/utils.py @@ -5041,7 +5041,7 @@ def sum_of_two_storage_sizes(storage_size1, storage_size2, convert_size=1024): size = size1 + size2 new_storage_size = f"{size}{unit}" return new_storage_size - + def is_z_stream_upgrade(): """