From c7087c81387e032e84a70b215ec494185b4f9f81 Mon Sep 17 00:00:00 2001 From: Petr Balogh Date: Tue, 21 May 2024 22:10:46 +0200 Subject: [PATCH] Add 4.17 ODF and OCP config files Signed-off-by: Petr Balogh --- .../conf/ocp_version/ocp-4.17-config.yaml | 16 ++++++++++++++++ .../conf/ocp_version/ocp-4.17-upgrade.yaml | 6 ++++++ ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml | 11 ----------- ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml | 11 ----------- ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml | 12 ++++++++++++ ocs_ci/framework/main.py | 3 +-- 6 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml create mode 100644 ocs_ci/framework/conf/ocp_version/ocp-4.17-upgrade.yaml delete mode 100644 ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml delete mode 100644 ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml create mode 100644 ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml diff --git a/ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml b/ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml new file mode 100644 index 00000000000..67f445a22f9 --- /dev/null +++ b/ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml @@ -0,0 +1,16 @@ +--- +# Config file for nightly OCP 4.17 +RUN: + client_version: "4.17.0-0.nightly" +DEPLOYMENT: + installer_version: "4.17.0-0.nightly" + terraform_version: "1.0.11" + # ignition_version can be found here + # https://docs.openshift.com/container-platform/4.7/post_installation_configuration/machine-configuration-tasks.html#machine-config-overview-post-install-machine-configuration-tasks + ignition_version: "3.2.0" +ENV_DATA: + # TODO: replace with 4.17 once template is available + vm_template: "rhcos-416.94.202403071059-0-vmware.x86_64" + acm_hub_channel: release-2.11 + acm_version: "2.11" + submariner_version: "0.17.0" diff --git a/ocs_ci/framework/conf/ocp_version/ocp-4.17-upgrade.yaml b/ocs_ci/framework/conf/ocp_version/ocp-4.17-upgrade.yaml new file mode 100644 index 00000000000..43cf632f3a5 --- /dev/null +++ b/ocs_ci/framework/conf/ocp_version/ocp-4.17-upgrade.yaml @@ -0,0 +1,6 @@ +--- +# Use this config for upgrading of OCP 4.16 to 4.17 cluster +UPGRADE: + ocp_upgrade_version: "4.17.0-0.nightly" + ocp_upgrade_path: "registry.ci.openshift.org/ocp/release" + ocp_channel: "stable-4.17" diff --git a/ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml b/ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml deleted file mode 100644 index d2693125660..00000000000 --- a/ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -DEPLOYMENT: - default_ocs_registry_image: "quay.io/rhceph-dev/ocs-registry:latest-stable-4.10" - default_latest_tag: 'latest-stable-4.10' - ocs_csv_channel: "stable-4.10" - default_ocp_version: '4.10' -ENV_DATA: - ocs_version: '4.10' -REPORTING: - default_ocs_must_gather_latest_tag: 'latest-4.10' - default_ocs_must_gather_image: "quay.io/rhceph-dev/ocs-must-gather" diff --git a/ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml b/ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml deleted file mode 100644 index 6315d19ac57..00000000000 --- a/ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml +++ /dev/null @@ -1,11 +0,0 @@ ---- -DEPLOYMENT: - default_ocs_registry_image: "quay.io/rhceph-dev/ocs-registry:latest-stable-4.11" - default_latest_tag: 'latest-stable-4.11' - ocs_csv_channel: "stable-4.11" - default_ocp_version: '4.11' -ENV_DATA: - ocs_version: '4.11' -REPORTING: - default_ocs_must_gather_latest_tag: 'latest-4.11' - default_ocs_must_gather_image: "quay.io/rhceph-dev/ocs-must-gather" diff --git a/ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml b/ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml new file mode 100644 index 00000000000..21f6147063a --- /dev/null +++ b/ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml @@ -0,0 +1,12 @@ +--- +DEPLOYMENT: + default_ocs_registry_image: "quay.io/rhceph-dev/ocs-registry:latest-4.17" + # TODO: Change to lastest-stable-4.17 once we have stable build + default_latest_tag: 'latest-4.17' + ocs_csv_channel: "stable-4.17" + default_ocp_version: '4.17' +ENV_DATA: + ocs_version: '4.17' +REPORTING: + default_ocs_must_gather_latest_tag: 'latest-4.17' + default_ocs_must_gather_image: "quay.io/rhceph-dev/ocs-must-gather" diff --git a/ocs_ci/framework/main.py b/ocs_ci/framework/main.py index 122fbba3838..964625ba100 100644 --- a/ocs_ci/framework/main.py +++ b/ocs_ci/framework/main.py @@ -129,13 +129,12 @@ def process_ocsci_conf(arguments): action="store", choices=[ "4.99", - "4.10", - "4.11", "4.12", "4.13", "4.14", "4.15", "4.16", + "4.17", ], ) parser.add_argument("--ocs-registry-image")