From d0135c4b4b2a08776341243872fdc710c1a8e6a2 Mon Sep 17 00:00:00 2001 From: Khuzaima-Shakeel Date: Tue, 28 Oct 2025 12:39:18 +0530 Subject: [PATCH 1/3] feat: added support for ocp_version 4.19 --- ibm_catalog.json | 12 ++++++++++-- tests/pr_test.go | 8 ++++---- variables.tf | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 9dd796f3..2c292f64 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -266,8 +266,12 @@ { "key": "openshift_version", "required": true, - "default_value": "4.18", + "default_value": "4.19", "options": [ + { + "displayname": "4.19", + "value": "4.19" + }, { "displayname": "4.18", "value": "4.18" @@ -1475,9 +1479,13 @@ }, { "key": "openshift_version", - "default_value": "4.18", + "default_value": "4.19", "required": true, "options": [ + { + "displayname": "4.19", + "value": "4.19" + }, { "displayname": "4.18", "value": "4.18" diff --git a/tests/pr_test.go b/tests/pr_test.go index 23cfaf89..f1bd3645 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -31,10 +31,10 @@ const resourceGroup = "geretain-test-base-ocp-vpc" const yamlLocation = "../common-dev-assets/common-go-assets/common-permanent-resources.yaml" // Ensure there is one test per supported OCP version -const ocpVersion1 = "4.18" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample -const ocpVersion2 = "4.17" // used by TestCustomSGExample and TestRunCustomsgExample -const ocpVersion3 = "4.16" // used by TestRunAdvancedExample and TestCrossKmsSupportExample -const ocpVersion4 = "4.15" // used by TestRunAddRulesToSGExample and TestRunBasicExample +const ocpVersion1 = "4.19" // used by TestRunFullyConfigurable, TestRunUpgradeFullyConfigurable, TestFSCloudInSchematic and TestRunMultiClusterExample +const ocpVersion2 = "4.18" // used by TestCustomSGExample and TestRunCustomsgExample +const ocpVersion3 = "4.17" // used by TestRunAdvancedExample and TestCrossKmsSupportExample +const ocpVersion4 = "4.16" // used by TestRunAddRulesToSGExample and TestRunBasicExample const terraformVersion = "terraform_v1.10" // This should match the version in the ibm_catalog.json var ( diff --git a/variables.tf b/variables.tf index 323bb4e5..e673fe7e 100644 --- a/variables.tf +++ b/variables.tf @@ -196,6 +196,7 @@ variable "ocp_version" { var.ocp_version == "4.16", var.ocp_version == "4.17", var.ocp_version == "4.18", + var.ocp_version == "4.19", ]) error_message = "The specified ocp_version is not of the valid versions." } From bf85de154ab2685af15e14c3958f6102aceb4c9d Mon Sep 17 00:00:00 2001 From: Khuzaima-Shakeel Date: Wed, 29 Oct 2025 16:11:37 +0530 Subject: [PATCH 2/3] updated worker pool validation --- variables.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/variables.tf b/variables.tf index e673fe7e..4c094fc0 100644 --- a/variables.tf +++ b/variables.tf @@ -107,9 +107,10 @@ variable "worker_pools" { (local.ocp_version_num == "4.14" && wp.operating_system == local.os_rhel) || (local.ocp_version_num == "4.15" && contains([local.os_rhel, local.os_rhcos], wp.operating_system)) || (contains(["4.16", "4.17"], local.ocp_version_num) && contains([local.os_rhel9, local.os_rhel, local.os_rhcos], wp.operating_system)) || - (local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) + (local.ocp_version_num == "4.18" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) || + (local.ocp_version_num == "4.19" && contains([local.os_rhel9, local.os_rhcos], wp.operating_system)) ]) - error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64); v4.18: (RHCOS, RHEL_9_64)" + error_message = "Invalid operating system for the given OCP version. Ensure the OS is compatible with the OCP version. Supported compatible OCP version and OS are v4.14: (REDHAT_8_64); v4.15: (REDHAT_8_64, RHCOS) ; v4.16 and v4.17: (REDHAT_8_64, RHCOS, RHEL_9_64); v4.18: (RHCOS, RHEL_9_64); v4.19: (RHEL_9_64, RHCOS)" } validation { From b9fdca59017e22652579cbcdc3769a04e224e874 Mon Sep 17 00:00:00 2001 From: Khuzaima-Shakeel Date: Wed, 29 Oct 2025 16:14:11 +0530 Subject: [PATCH 3/3] SKIP UPGRADE TEST