Merge branch 'update-250925' into mongo8013

Author: jainyjoseph

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

@@ -1,11 +1,11 @@
 ---
-# Case bundle configuration for IBM Maximo Operator Catalog 250902 (AMD64)
+# Case bundle configuration for IBM Maximo Operator Catalog 250925 (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:20f4d0b0257262523ba40fe3a209959cbff949b7d5344d3cb85d9041f2fa3403
+catalog_digest: sha256:66ee4a36798ae875564efea83e6656302a76772bde833f46f3917a5dcfe76fb4
 
 ocp_compatibility:
   - 4.15

src/mas/devops/data/catalogs/v9-250925-ppc64le.yaml

@@ -1,11 +1,11 @@
 ---
-# Case bundle configuration for IBM Maximo Operator Catalog 250902 (PPC)
+# Case bundle configuration for IBM Maximo Operator Catalog 250925 (PPC)
 # -----------------------------------------------------------------------------
 # 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:beb0f715f7bed77bc75306987bb408f1afcd22204b7cbf66031b46b568515b98
+catalog_digest: sha256:c2d3fe7786b48696b3eb4fa62533a910e9ceae76c80209da8abccfe8f0f1f768
 
 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)

src/mas/devops/data/catalogs/v9-250925-s390x.yaml

@@ -1,11 +1,11 @@
 ---
-# Case bundle configuration for IBM Maximo Operator Catalog 250902 (Z)
+# Case bundle configuration for IBM Maximo Operator Catalog 250925 (Z)
 # -----------------------------------------------------------------------------
 # 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:f8518d6d4ffe3483b18d46a27970218425903d059087af720e7adc59910984c5
+catalog_digest: sha256:c883aaabe1b63aa5f291d028129b3bf97e87dee6220fa977babc3216baf18e1f
 
 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)

src/mas/devops/olm.py

@@ -156,12 +156,16 @@ def applySubscription(dynClient: DynamicClient, namespace: str, packageName: str
 
     # Wait for Subscription to complete
     logger.debug(f"Waiting for Subscription {name} in {namespace}")
-    subscriptionResource = subscriptionsAPI.get(name=name, namespace=namespace)
-    while subscriptionResource.status.state != "AtLatestKnown":
+    while True:
         subscriptionResource = subscriptionsAPI.get(name=name, namespace=namespace)
-        sleep(30)
+        state = getattr(subscriptionResource.status, "state", None)
+
+        if state == "AtLatestKnown":
+            logger.debug(f"Subscription {name} in {namespace} reached state: {state}")
+            return subscriptionResource
 
-    return subscriptionResource
+        logger.debug(f"Subscription {name} in {namespace} not ready yet (state = {state}), retrying...")
+        sleep(30)
 
 
 def deleteSubscription(dynClient: DynamicClient, namespace: str, packageName: str) -> None: