From 2e394dacdd7da206a236f4f0457132977c380970 Mon Sep 17 00:00:00 2001 From: Shylesh Kumar Mohan Date: Tue, 25 Jun 2024 23:49:25 +0100 Subject: [PATCH] Add --acm-version CLI option Signed-off-by: Shylesh Kumar Mohan --- conf/README.md | 1 + ocs_ci/framework/pytest_customization/ocscilib.py | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/conf/README.md b/conf/README.md index 0545be34271..0203cec53ed 100644 --- a/conf/README.md +++ b/conf/README.md @@ -204,6 +204,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 17598736163..0547e81fd61 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", @@ -670,6 +675,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