Merge branch 'stable' into mascore-11094

Author: terc1997

src/mas/devops/data/catalogs/v9-260326-amd64.yaml

@@ -13,6 +13,7 @@ ocp_compatibility:
 - "4.18"
 - "4.19"
 - "4.20"
+- "4.21"
 
 # Dependencies
 # -----------------------------------------------------------------------------
@@ -154,7 +155,7 @@ editorial:
   whats_new:
   - title: '**Security updates and bug fixes**'
     details:
-    - IBM Maximo Application Suite Core Platform [v8.10.36](https://www.ibm.com/support/pages/node/7267462), [v8.11.36](https://www.ibm.com/support/pages/node/7267463), [v9.0.23](https://www.ibm.com/support/pages/node/7267464) and [v9.1.14](https://www.ibm.com/support/pages/node/7267465)
+    - IBM Maximo Application Suite Core Platform [v8.10.36](https://www.ibm.com/support/pages/node/7267462), [v8.11.33](https://www.ibm.com/support/pages/node/7267463), [v9.0.23](https://www.ibm.com/support/pages/node/7267464) and [v9.1.14](https://www.ibm.com/support/pages/node/7267465)
     - IBM Maximo Manage [v8.6.37](https://www.ibm.com/support/pages/node/7266693), [v8.7.31](https://www.ibm.com/support/pages/node/7266692), [v9.0.24](https://www.ibm.com/support/pages/node/7266691) and [v9.1.15](https://www.ibm.com/support/pages/node/7266690)
     - IBM Maximo IoT [v8.7.32](https://www.ibm.com/support/pages/node/7267121), [v8.8.29](https://www.ibm.com/support/pages/node/7267122), [v9.0.18](https://www.ibm.com/support/pages/node/7267123) and [v9.1.9](https://www.ibm.com/support/pages/node/7267124)
     - IBM Maximo Monitor [v8.10.29](https://www.ibm.com/support/pages/node/7267303), [v8.11.27](https://www.ibm.com/support/pages/node/7267304), [v9.0.19](https://www.ibm.com/support/pages/node/7267305) and [v9.1.9](https://www.ibm.com/support/pages/node/7267306)
@@ -173,4 +174,4 @@ editorial:
     - title: A known issue exists in the January 29, 2026 release affecting HSE and Oil & Gas (9.0.23 / 9.1.64). Customers with HSE installed should avoid upgrading to the January release. Installation of HSE or Oil & Gas on Manage 9.0.x / 9.1.x should be deferred until the February 2026 patch.
     - title: A known issue has been identified in Db2u warehouse operator in this catalog. Customers restoring/upgrading Db2, intermittently get db2 `SQL0290N  Table space access is not allowed.  SQLSTATE=55039` error causing connectivity issue between MAS and Db2. If you are facing this problem, please refer to the workaround provided in this [documentation](https://www.ibm.com/docs/en/cloud-paks/cp-data/5.3.x?topic=SSQNUZ_5.3.x/svc-db2/known-issues-dbs.htm#known-issues-dbs__db2-instance-fails-sql0290n__title__1).
     - title: A known issue exists in the February 26, 2026 release affecting IBM Maximo Real Estate and Facilities. Customers with MREF installed should avoid upgrading to the February 9.1.8 release. Installation of MREF 9.1.x should be deferred until the March 2026 patch.
-    - title: A know issue in IBM Maximo Real Estate and Facilities, users may encounter failures during upgrade scenarios (9.1.x → 9.2 FC) and experience slow installation in airgap environments in the March 26, 2026 release.
+    - title: A know issue in IBM Maximo Real Estate and Facilities, users may encounter failures during upgrade scenarios (9.1.x → 9.2 FC) and experience slow installation in airgap environments in the March 26, 2026 release.

src/mas/devops/data/ocp.yaml

@@ -9,9 +9,14 @@
 # https://access.redhat.com/support/policy/updates/openshift/
 
 ocp_versions:
+  "4.21":
+    ga_date: "February 3, 2026"
+    standard_support: "GA of 4.22 + 3 Months"
+    extended_support: "N/A"
+
   "4.20":
     ga_date: "October 21, 2025"
-    standard_support: "May 3, 2026"
+    standard_support: "April 21, 2027"
     extended_support: "October 21, 2028"
 
   "4.19":
@@ -21,8 +26,8 @@ ocp_versions:
 
   "4.18":
     ga_date: "February 25, 2025"
-    standard_support: "February 25, 2025"
-    extended_support: "August 25, 2026"
+    standard_support: "August 25, 2026"
+    extended_support: "February 25, 2028"
 
   "4.17":
     ga_date: "October 1, 2024"

src/mas/devops/templates/pipelinerun-update.yml.j2

@@ -139,3 +139,10 @@ spec:
     - name: skip_entitlement_key_flag
       value: "{{ skip_entitlement_key_flag }}"
 {%- endif %}
+{%- if odh_to_rhoai_migration is defined and odh_to_rhoai_migration != "" %}
+
+    # AI Service Migration (ODH to RHOAI)
+    # -------------------------------------------------------------------------
+    - name: odh_to_rhoai_migration
+      value: "{{ odh_to_rhoai_migration }}"
+{%- endif %}