Merge remote-tracking branch 'origin' into neha-cpd

nehasangwai-ibm · nehasangwai-ibm · commit 43205aae97bb · 2025-11-25T00:34:49.000+05:30
diff --git a/src/mas/devops/data/catalogs/v9-250828-amd64.yaml b/src/mas/devops/data/catalogs/v9-250828-amd64.yaml
@@ -8,6 +8,7 @@
 catalog_digest: sha256:0a24540abbb65155d3dfde68fe57a777aae785127ebb34a272614a06710caaa2
 
 ocp_compatibility:
+  - 4.14
   - 4.15
   - 4.16
   - 4.17
diff --git a/src/mas/devops/data/catalogs/v9-250828-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250828-ppc64le.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:c6ada94174c7318644e8c31d568969967418b58cde4b5f017f1611298b2d359c
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.0   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-250828-s390x.yaml b/src/mas/devops/data/catalogs/v9-250828-s390x.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:8d6f205e59ac55155db6cf348029d52c035236bd60c8d212dcf2634e0a716cb1
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.0   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml
@@ -8,6 +8,7 @@
 catalog_digest: sha256:6a18fa3fac8c9f826f18b4f2aeacbe97f180a1f2e8efd4bae5846f0b2b359752
 
 ocp_compatibility:
+  - 4.14
   - 4.15
   - 4.16
   - 4.17
diff --git a/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:df9bdaa918550e2279c9269c54f2700ea98d9c537b1b57468bd16041f363fafe
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.0   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:142080295b0bfc53e738c94b1b49cb7f6ba1668ab7a010cf214f32e20f396664
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.0   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-250925-amd64.yaml b/src/mas/devops/data/catalogs/v9-250925-amd64.yaml
@@ -8,6 +8,7 @@
 catalog_digest: sha256:db5ac0b24bc6c0cb2af8eebcf529fee8ce944196d49aaf7448a00b6e9ffa8d96
 
 ocp_compatibility:
+  - 4.14
   - 4.15
   - 4.16
   - 4.17
diff --git a/src/mas/devops/data/catalogs/v9-250925-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250925-ppc64le.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:3f7809233f72bf6007e7099a1c38a3577e1ffb0197a29b891a24fef007a8dcf7
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.1   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-251010-amd64.yaml b/src/mas/devops/data/catalogs/v9-251010-amd64.yaml
@@ -8,6 +8,7 @@
 catalog_digest: sha256:7162cdaa46c0f290df79956e03d4ffda869c346a1c9752276898e8bae475128e
 
 ocp_compatibility:
+  - 4.14
   - 4.15
   - 4.16
   - 4.17
diff --git a/src/mas/devops/data/catalogs/v9-251010-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-251010-ppc64le.yaml
@@ -7,6 +7,13 @@
 
 catalog_digest: sha256:5ae3c0f01d691235c5d42d09d035f5a3d80bcedeb08e28423a8e80c75644547a
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.1   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-251030-amd64.yaml b/src/mas/devops/data/catalogs/v9-251030-amd64.yaml
@@ -8,10 +8,12 @@
 catalog_digest: sha256:c5036246257a8c8b25251a14f9c2a26285c4e27593b81fc0458b762bc2e64462
 
 ocp_compatibility:
+  - 4.14
   - 4.15
   - 4.16
   - 4.17
   - 4.18
+  - 4.19
 
 # Dependencies
 # -----------------------------------------------------------------------------
diff --git a/src/mas/devops/data/catalogs/v9-251030-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-251030-ppc64le.yaml
@@ -7,6 +7,14 @@
 
 catalog_digest: sha256:9903b6731465efb8ffe2b427aad773ad85a174d3b2323af1e2bf10f0c7747256
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+  - 4.19
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.2   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-251030-s390x.yaml b/src/mas/devops/data/catalogs/v9-251030-s390x.yaml
@@ -7,6 +7,14 @@
 
 catalog_digest: sha256:799ac815a86985f5b3ab191d3939590cdc46e59c7f6aea0293fe4ea39bd754b2
 
+ocp_compatibility:
+  - 4.14
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+  - 4.19
+
 uds_version: 2.0.12  # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
 sls_version: 3.12.2  # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
 tsm_version: 1.7.2   # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
diff --git a/src/mas/devops/data/catalogs/v9-251127-amd64.yaml b/src/mas/devops/data/catalogs/v9-251127-amd64.yaml
@@ -0,0 +1,144 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog 251030 (AMD64)
+# -----------------------------------------------------------------------------
+# In the future this won't be necessary as we'll be able to mirror from the
+# catalog itself, but not everything in the catalog supports this yet (including MAS)
+# so we need to use the CASE bundle mirror process still.
+
+catalog_digest: sha256:e1822cc642b155a22d82f0ed7149f72cfe67e4458605fac37e7ad43ad0a4ac6d
+
+ocp_compatibility:
+  - 4.15
+  - 4.16
+  - 4.17
+  - 4.18
+  - 4.19
+
+# Dependencies
+# -----------------------------------------------------------------------------
+ibm_licensing_version: 4.2.17                # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
+common_svcs_version: 4.12.0                  # Operator version 4.12.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
+common_svcs_version_1: 4.11.0                  # Additional version 4.11.0
+
+cp4d_platform_version: 5.1.1                 # Operator version 5.1.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
+ibm_zen_version: 6.1.1+20250218.180746.89    # For CPD5 ibm-zen has to be explicitily mirrored
+
+db2u_version: 7.3.1+20250821.161005.16793    # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
+events_version: 5.0.1                        # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
+uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
+sls_version: 3.12.2                          # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
+tsm_version: 1.7.2                           # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
+dd_version: 1.1.20                           # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
+appconnect_version: 6.2.0                    # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
+wsl_version: 10.2.0                          # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
+wsl_runtimes_version: 10.3.0                 # cpd 5.1.3 uses version 10.3.0 of wsl runtimes but only 10.2.0 for wsl itself
+wml_version: 10.2.0                          # Operator version 5.0.0
+
+# Why are these commented out?
+# ccs_build: +20240528.144404.460            # ibm-ccs from version 9.0.0 requires the build version
+# datarefinery_build: +20240517.202103.146
+
+spark_version: 10.2.0                        # Operator version 7.3.0
+cognos_version: 27.2.0                       # Operator version 25.0.0
+couchdb_version: 1.0.13                      # Operator version 2.2.1 (1.0.13) sticking with 1.0.13 # (This is required for Assist 9.0, https://github.com/IBM/cloud-pak/blob/master/repo/case/ibm-couchdb/index.yaml)
+elasticsearch_version: 1.1.2667              # Operator version 1.1.2667
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  9.2.x-feature: 9.2.0-pre.stable_2456 # Updated
+  9.1.x: 9.1.5         # Updated
+  9.0.x: 9.0.16        # Updated
+  8.10.x: 8.10.30      # Updated
+  8.11.x: 8.11.27      # Updated
+mas_assist_version:
+  9.1.x: 9.1.4     # Updated
+  9.0.x: 9.0.10    # Updated
+  8.10.x: 8.7.8   # No Update
+  8.11.x: 8.8.7   # No Update
+mas_hputilities_version:
+  9.1.x: ""       # Not Supported
+  9.0.x: ""       # Not Supported
+  8.10.x: 8.6.7   # No Update
+  8.11.x: ""      # Not Supported
+mas_iot_version:
+  9.1.x: 9.1.4     # Updated
+  9.0.x: 9.0.13    # Updated
+  8.10.x: 8.7.27   # Updated
+  8.11.x: 8.8.23   # Updated
+mas_manage_version:
+  9.2.x-feature: 9.2.0-pre.stable_14287 # Updated
+  9.1.x: 9.1.5         # Updated
+  9.0.x: 9.0.18        # Updated
+  8.10.x: 8.6.31       # Updated
+  8.11.x: 8.7.25       # Updated
+mas_monitor_version:
+  9.1.x: 9.1.4    # Updated
+  9.0.x: 9.0.14   # Updated
+  8.10.x: 8.10.24 # Updated
+  8.11.x: 8.11.22 # Updated
+mas_optimizer_version:
+  9.2.x-feature: 9.2.0-pre.stable_2382 # Updated
+  9.1.x: 9.1.5         # Updated
+  9.0.x: 9.0.16        # Updated
+  8.10.x: 8.4.23       # Updated
+  8.11.x: 8.5.22       # Updated
+mas_predict_version:
+  9.1.x: 9.1.3     # Updated
+  9.0.x: 9.0.10    # Updated
+  8.10.x: 8.8.11   # Updated
+  8.11.x: 8.9.13   # Updated
+mas_visualinspection_version:
+  9.1.x: 9.1.3         # No update for v9-251030
+  9.0.x: 9.0.13        # Updated
+  8.10.x: 8.8.4        # No Update
+  8.11.x: 8.9.16       # Updated
+mas_facilities_version:
+  9.1.x: 9.1.4    # Updated
+  9.0.x: ""       # Not Supported
+  8.10.x: ""      # Not Supported
+  8.11.x: ""      # Not Supported
+
+
+# Maximo AI Service
+# ------------------------------------------------------------------------------
+aiservice_version:
+  9.1.x: 9.1.7  # No Update
+
+# Extra Images for UDS
+# ------------------------------------------------------------------------------
+uds_extras_version: 1.5.0
+
+# Extra Images for Mongo
+# ------------------------------------------------------------------------------
+mongo_extras_version_default: 8.0.13
+
+# Variables used to mirror additional mongo image versions
+mongo_extras_version_4: 4.4.21
+mongo_extras_version_5: 5.0.23
+mongo_extras_version_6: 6.0.12
+mongo_extras_version_7: 7.0.23
+mongo_extras_version_8: 8.0.13
+
+# Extra Images for Db2u
+# ------------------------------------------------------------------------------
+db2u_extras_version: 1.0.6 # No Update
+db2u_filter: db2
+
+# Extra Images for IBM Watson Discovery
+# ------------------------------------------------------------------------------
+#wd_extras_version: 1.0.4
+
+# Extra Images for Amlen
+# ------------------------------------------------------------------------------
+amlen_extras_version: 1.1.3
+
+# Default Cloud Pak for Data version
+# ------------------------------------------------------------------------------
+cpd_product_version_default: 5.1.3
+
+# Extra Images for kmodels
+# ------------------------------------------------------------------------------
+kmodels_extras_version_default: 1.0.14
+
diff --git a/src/mas/devops/ocp.py b/src/mas/devops/ocp.py
@@ -72,12 +72,20 @@ def getClusterVersion(dynClient: DynamicClient) -> str:
         clusterVersion = clusterVersionAPI.get(name="version")
         for record in clusterVersion.status.history:
             if record.state == "Completed":
-                return record.state.version
+                return record.version
     except NotFoundError:
         logger.debug("Unable to retrieve ClusterVersion")
     return None
 
 
+def isClusterVersionInRange(version: str, releases: list[str]) -> bool:
+    if releases is not None:
+        for release in releases:
+            if version.startswith(f"{release}."):
+                return True
+    return False
+
+
 def getNamespace(dynClient: DynamicClient, namespace: str) -> dict:
     """
     Get a namespace
diff --git a/src/mas/devops/tekton.py b/src/mas/devops/tekton.py
@@ -357,12 +357,10 @@ def launchUpgradePipeline(dynClient: DynamicClient,
 def launchUninstallPipeline(dynClient: DynamicClient,
                             instanceId: str,
                             droNamespace: str,
-                            certManagerProvider: str = "redhat",
                             uninstallCertManager: bool = False,
                             uninstallGrafana: bool = False,
                             uninstallCatalog: bool = False,
-                            uninstallCommonServices: bool = False,
-                            uninstallUDS: bool = False,
+                            uninstallDRO: bool = False,
                             uninstallMongoDb: bool = False,
                             uninstallSLS: bool = False) -> str:
     """
@@ -380,24 +378,21 @@ def launchUninstallPipeline(dynClient: DynamicClient,
 
     grafanaAction = "uninstall" if uninstallGrafana else "none"
     certManagerAction = "uninstall" if uninstallCertManager else "none"
-    commonServicesAction = "uninstall" if uninstallCommonServices else "none"
     ibmCatalogAction = "uninstall" if uninstallCatalog else "none"
     mongoDbAction = "uninstall" if uninstallMongoDb else "none"
     slsAction = "uninstall" if uninstallSLS else "none"
-    udsAction = "uninstall" if uninstallUDS else "none"
+    droAction = "uninstall" if uninstallDRO else "none"
 
     # Render the pipelineRun
     renderedTemplate = template.render(
         timestamp=timestamp,
         mas_instance_id=instanceId,
         grafana_action=grafanaAction,
-        cert_manager_provider=certManagerProvider,
         cert_manager_action=certManagerAction,
-        common_services_action=commonServicesAction,
         ibm_catalogs_action=ibmCatalogAction,
         mongodb_action=mongoDbAction,
         sls_action=slsAction,
-        uds_action=udsAction,
+        dro_action=droAction,
         dro_namespace=droNamespace
     )
     logger.debug(renderedTemplate)
diff --git a/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2 b/src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2
diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2
diff --git a/src/mas/devops/templates/pipelinerun-uninstall.yml.j2 b/src/mas/devops/templates/pipelinerun-uninstall.yml.j2
diff --git a/src/mas/devops/templates/pipelinerun-update.yml.j2 b/src/mas/devops/templates/pipelinerun-update.yml.j2
diff --git a/test/src/test_ocp.py b/test/src/test_ocp.py
