Skip to content

Commit

Permalink
Merge pull request #9836 from petr-balogh/add-odf-4.17
Browse files Browse the repository at this point in the history
Add 4.17 ODF and OCP config files
  • Loading branch information
petr-balogh authored May 22, 2024
2 parents aa653ed + c7087c8 commit ca2da16
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 24 deletions.
16 changes: 16 additions & 0 deletions ocs_ci/framework/conf/ocp_version/ocp-4.17-config.yaml
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 6 additions & 0 deletions ocs_ci/framework/conf/ocp_version/ocp-4.17-upgrade.yaml
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 0 additions & 11 deletions ocs_ci/framework/conf/ocs_version/ocs-4.10.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions ocs_ci/framework/conf/ocs_version/ocs-4.11.yaml

This file was deleted.

12 changes: 12 additions & 0 deletions ocs_ci/framework/conf/ocs_version/ocs-4.17.yaml
Original file line number Diff line number Diff line change
@@ -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"
3 changes: 1 addition & 2 deletions ocs_ci/framework/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit ca2da16

Please sign in to comment.