From db098227a2c2b18ebd2b7e7f4b9c83d48590e2f7 Mon Sep 17 00:00:00 2001 From: tusharjadhav3302 Date: Wed, 17 Jun 2026 15:00:40 +0530 Subject: [PATCH 1/3] Add version-pinned nightly testconfigs for OCP 4.21, 4.22, 4.23, and 5.0 on RHOSO Co-authored-by: Cursor --- .../osp_verification_4.21_nightly.yaml | 58 ++++++++++++++++++ .../osp_verification_4.22_nightly.yaml | 58 ++++++++++++++++++ .../osp_verification_4.23_nightly.yaml | 58 ++++++++++++++++++ .../osp_verification_5.0_nightly.yaml | 61 +++++++++++++++++++ 4 files changed, 235 insertions(+) create mode 100644 jobs_definitions/osp_verification_4.21_nightly.yaml create mode 100644 jobs_definitions/osp_verification_4.22_nightly.yaml create mode 100644 jobs_definitions/osp_verification_4.23_nightly.yaml create mode 100644 jobs_definitions/osp_verification_5.0_nightly.yaml diff --git a/jobs_definitions/osp_verification_4.21_nightly.yaml b/jobs_definitions/osp_verification_4.21_nightly.yaml new file mode 100644 index 00000000..26d4a7f4 --- /dev/null +++ b/jobs_definitions/osp_verification_4.21_nightly.yaml @@ -0,0 +1,58 @@ +--- +# +# * OSP VERIFICATION - OCP 4.21 NIGHTLY * +# +# - Version-pinned variant of osp_verification.yaml for OCP 4.21 pre-GA nightly. +# - Used for early regression detection before 4.21 reaches the stable channel. +# - Runs on the RHOSO 18.0 OSASINFRA Validated Architecture (serval70). +# +# Parent epic: https://redhat.atlassian.net/browse/OSPRH-31438 +# Task: https://redhat.atlassian.net/browse/OSPRH-31439 +# + +openshift_release: "4.21" +openshift_build_name: "" # Empty resolves to latest nightly via 4.21.0-0.nightly/latest +installation_type: ipi +stages: + - prepare + - install + - post + - verification + - day2ops + - openstack_test + - lb_tests + - egressip_tests + +day2ops_procedures: + - rotate_app_creds + +ocp_deployment_topology: + network_type: OVNKubernetes + primary_ip_protocol: ipv4 # ipv4 or ipv6 + secondary_ip_protocol: "" # ipv4, ipv6, or "" for single-stack + ipv4: + ip_version: 4 + tenant_subnet: + cidr: 10.196.0.0/16 # CIDR for the machine network (tenant network) + cluster_network: + cidr: 10.128.0.0/14 + host_prefix: 23 + service_network: + - 172.30.0.0/16 + flavors: + master: + name: "master" + ram: 16384 + vcpus: 4 + disk: 30 + worker: + name: "worker" + ram: 8192 + vcpus: 2 + disk: 30 + replicas: + master: 3 + worker: 2 + servergroups: + master: "anti-affinity" + worker: "anti-affinity" diff --git a/jobs_definitions/osp_verification_4.22_nightly.yaml b/jobs_definitions/osp_verification_4.22_nightly.yaml new file mode 100644 index 00000000..635706e9 --- /dev/null +++ b/jobs_definitions/osp_verification_4.22_nightly.yaml @@ -0,0 +1,58 @@ +--- +# +# * OSP VERIFICATION - OCP 4.22 NIGHTLY * +# +# - Version-pinned variant of osp_verification.yaml for OCP 4.22 nightly. +# - Ensures explicit 4.22 coverage persists after 4-stable rolls to 4.23. +# - Runs on the RHOSO 18.0 OSASINFRA Validated Architecture (serval70). +# +# Parent epic: https://redhat.atlassian.net/browse/OSPRH-31438 +# Task: https://redhat.atlassian.net/browse/OSPRH-31440 +# + +openshift_release: "4.22" +openshift_build_name: "" # Empty resolves to latest nightly via 4.22.0-0.nightly/latest +installation_type: ipi +stages: + - prepare + - install + - post + - verification + - day2ops + - openstack_test + - lb_tests + - egressip_tests + +day2ops_procedures: + - rotate_app_creds + +ocp_deployment_topology: + network_type: OVNKubernetes + primary_ip_protocol: ipv4 # ipv4 or ipv6 + secondary_ip_protocol: "" # ipv4, ipv6, or "" for single-stack + ipv4: + ip_version: 4 + tenant_subnet: + cidr: 10.196.0.0/16 # CIDR for the machine network (tenant network) + cluster_network: + cidr: 10.128.0.0/14 + host_prefix: 23 + service_network: + - 172.30.0.0/16 + flavors: + master: + name: "master" + ram: 16384 + vcpus: 4 + disk: 30 + worker: + name: "worker" + ram: 8192 + vcpus: 2 + disk: 30 + replicas: + master: 3 + worker: 2 + servergroups: + master: "anti-affinity" + worker: "anti-affinity" diff --git a/jobs_definitions/osp_verification_4.23_nightly.yaml b/jobs_definitions/osp_verification_4.23_nightly.yaml new file mode 100644 index 00000000..214510e1 --- /dev/null +++ b/jobs_definitions/osp_verification_4.23_nightly.yaml @@ -0,0 +1,58 @@ +--- +# +# * OSP VERIFICATION - OCP 4.23 NIGHTLY * +# +# - Version-pinned variant of osp_verification.yaml for OCP 4.23 pre-GA nightly. +# - Enables early regression detection before 4.23 reaches the stable channel. +# - Runs on the RHOSO 18.0 OSASINFRA Validated Architecture (serval70). +# +# Parent epic: https://redhat.atlassian.net/browse/OSPRH-31438 +# Task: https://redhat.atlassian.net/browse/OSPRH-31441 +# + +openshift_release: "4.23" +openshift_build_name: "" # Empty resolves to latest nightly via 4.23.0-0.nightly/latest +installation_type: ipi +stages: + - prepare + - install + - post + - verification + - day2ops + - openstack_test + - lb_tests + - egressip_tests + +day2ops_procedures: + - rotate_app_creds + +ocp_deployment_topology: + network_type: OVNKubernetes + primary_ip_protocol: ipv4 # ipv4 or ipv6 + secondary_ip_protocol: "" # ipv4, ipv6, or "" for single-stack + ipv4: + ip_version: 4 + tenant_subnet: + cidr: 10.196.0.0/16 # CIDR for the machine network (tenant network) + cluster_network: + cidr: 10.128.0.0/14 + host_prefix: 23 + service_network: + - 172.30.0.0/16 + flavors: + master: + name: "master" + ram: 16384 + vcpus: 4 + disk: 30 + worker: + name: "worker" + ram: 8192 + vcpus: 2 + disk: 30 + replicas: + master: 3 + worker: 2 + servergroups: + master: "anti-affinity" + worker: "anti-affinity" diff --git a/jobs_definitions/osp_verification_5.0_nightly.yaml b/jobs_definitions/osp_verification_5.0_nightly.yaml new file mode 100644 index 00000000..9c63a9ae --- /dev/null +++ b/jobs_definitions/osp_verification_5.0_nightly.yaml @@ -0,0 +1,61 @@ +--- +# +# * OSP VERIFICATION - OCP 5.0 NIGHTLY * +# +# - Version-pinned variant of osp_verification.yaml for OCP 5.0 pre-GA nightly. +# - OCP 5.0 is the next major release; enables early regression detection. +# - Runs on the RHOSO 18.0 OSASINFRA Validated Architecture (serval70). +# +# Note: The sigstore fix env var (nightly_disable_image_policy) is EXPERIMENTAL +# and may change. Monitor shiftstack-qa/configs/global.yml for updates. +# +# Parent epic: https://redhat.atlassian.net/browse/OSPRH-31438 +# Task: https://redhat.atlassian.net/browse/OSPRH-31442 +# + +openshift_release: "5.0" +openshift_build_name: "" # Empty resolves to latest nightly via 5.0.0-0.nightly/latest +installation_type: ipi +stages: + - prepare + - install + - post + - verification + - day2ops + - openstack_test + - lb_tests + - egressip_tests + +day2ops_procedures: + - rotate_app_creds + +ocp_deployment_topology: + network_type: OVNKubernetes + primary_ip_protocol: ipv4 # ipv4 or ipv6 + secondary_ip_protocol: "" # ipv4, ipv6, or "" for single-stack + ipv4: + ip_version: 4 + tenant_subnet: + cidr: 10.196.0.0/16 # CIDR for the machine network (tenant network) + cluster_network: + cidr: 10.128.0.0/14 + host_prefix: 23 + service_network: + - 172.30.0.0/16 + flavors: + master: + name: "master" + ram: 16384 + vcpus: 4 + disk: 30 + worker: + name: "worker" + ram: 8192 + vcpus: 2 + disk: 30 + replicas: + master: 3 + worker: 2 + servergroups: + master: "anti-affinity" + worker: "anti-affinity" From 88ebef704dd3d2e9f4e28c15e4bb695151f03ee1 Mon Sep 17 00:00:00 2001 From: tusharjadhav3302 Date: Thu, 9 Jul 2026 15:39:18 +0530 Subject: [PATCH 2/3] Add egressip allowlist entries for OCP 4.23 and 5.0 Co-authored-by: Cursor --- .../roles/egressip_tests/files/egressip-allowlist.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/collection/stages/roles/egressip_tests/files/egressip-allowlist.yaml b/collection/stages/roles/egressip_tests/files/egressip-allowlist.yaml index aee6800d..32eb1a1f 100644 --- a/collection/stages/roles/egressip_tests/files/egressip-allowlist.yaml +++ b/collection/stages/roles/egressip_tests/files/egressip-allowlist.yaml @@ -147,3 +147,13 @@ ovnk_list: &ovnk_tests "4.22": "OVNKubernetes": <<: *ovnk_tests + +# OpenShift 4.23 +"4.23": + "OVNKubernetes": + <<: *ovnk_tests + +# OpenShift 5.0 +"5.0": + "OVNKubernetes": + <<: *ovnk_tests From 0766e031bb5a3f95b72d073d1d55603d6f8321fd Mon Sep 17 00:00:00 2001 From: tusharjadhav3302 Date: Thu, 9 Jul 2026 19:41:06 +0530 Subject: [PATCH 3/3] Sync servergroups to soft-anti-affinity to match base osp_verification.yaml Co-authored-by: Cursor --- jobs_definitions/osp_verification_4.21_nightly.yaml | 4 ++-- jobs_definitions/osp_verification_4.22_nightly.yaml | 4 ++-- jobs_definitions/osp_verification_4.23_nightly.yaml | 4 ++-- jobs_definitions/osp_verification_5.0_nightly.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jobs_definitions/osp_verification_4.21_nightly.yaml b/jobs_definitions/osp_verification_4.21_nightly.yaml index 26d4a7f4..af3140cc 100644 --- a/jobs_definitions/osp_verification_4.21_nightly.yaml +++ b/jobs_definitions/osp_verification_4.21_nightly.yaml @@ -54,5 +54,5 @@ ocp_deployment_topology: master: 3 worker: 2 servergroups: - master: "anti-affinity" - worker: "anti-affinity" + master: "soft-anti-affinity" + worker: "soft-anti-affinity" diff --git a/jobs_definitions/osp_verification_4.22_nightly.yaml b/jobs_definitions/osp_verification_4.22_nightly.yaml index 635706e9..c0e5b1a2 100644 --- a/jobs_definitions/osp_verification_4.22_nightly.yaml +++ b/jobs_definitions/osp_verification_4.22_nightly.yaml @@ -54,5 +54,5 @@ ocp_deployment_topology: master: 3 worker: 2 servergroups: - master: "anti-affinity" - worker: "anti-affinity" + master: "soft-anti-affinity" + worker: "soft-anti-affinity" diff --git a/jobs_definitions/osp_verification_4.23_nightly.yaml b/jobs_definitions/osp_verification_4.23_nightly.yaml index 214510e1..822b809d 100644 --- a/jobs_definitions/osp_verification_4.23_nightly.yaml +++ b/jobs_definitions/osp_verification_4.23_nightly.yaml @@ -54,5 +54,5 @@ ocp_deployment_topology: master: 3 worker: 2 servergroups: - master: "anti-affinity" - worker: "anti-affinity" + master: "soft-anti-affinity" + worker: "soft-anti-affinity" diff --git a/jobs_definitions/osp_verification_5.0_nightly.yaml b/jobs_definitions/osp_verification_5.0_nightly.yaml index 9c63a9ae..cd9dd5f6 100644 --- a/jobs_definitions/osp_verification_5.0_nightly.yaml +++ b/jobs_definitions/osp_verification_5.0_nightly.yaml @@ -57,5 +57,5 @@ ocp_deployment_topology: master: 3 worker: 2 servergroups: - master: "anti-affinity" - worker: "anti-affinity" + master: "soft-anti-affinity" + worker: "soft-anti-affinity"