[minor] Support for June catalog update

README.md

@@ -38,7 +38,6 @@ pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId)
 print(pipelineURL)
 ```
 
-
 mas-devops-create-initial-users
 ---------------------------------------------
 
@@ -89,4 +88,4 @@ mas-devops-create-initial-users-for-saas \
 Example of initial_users secret:
 ```json
 {"john.smith1@example.com":"primary,john1,smith1","john.smith2@example.com":"primary,john2,smith2","john.smith3@example.com":"secondary,john3,smith3"}
-```
+```

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

@@ -0,0 +1,108 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog 250605
+# -----------------------------------------------------------------------------
+# 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:0f555f786d3b0302f572d96fef8cabb25d0c32d364f72a970d076da4a7f97b43
+
+# Dependencies
+# -----------------------------------------------------------------------------
+ibm_licensing_version: 4.2.12                 # Operator version 4.2.11 (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)
+
+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: 6.0.1+20240704.142950.9960     # Operator version 110509.0.2 to find the version 6.0.1, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (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.11.1 # tbc              # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
+tsm_version: 1.6.2  # tbc              # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
+dd_version: 1.1.18  # tbc                # 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                           # Operator version 9.0.0
+wml_version: 10.2.0                           # Operator version 5.0.0
+# ccs_build: +20240528.144404.460              # ibm-ccs from version 9.0.0 requires the build version
+# datarefinery_build: +20240517.202103.146
+spark_version: 9.0.0                         # Operator version 5.0.0
+cognos_version: 27.2.0                       # Operator version 25.0.0
+couchdb_version: 1.0.13                      # Operator version 2.2.1 (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.2570              # Operator version 1.1.2470
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  9.1.x-feature: 9.1.0-pre.stable_9718 # tbc
+  9.0.x: 9.0.11   # tbc
+  8.10.x: 8.10.25 # tbc
+  8.11.x: 8.11.22 # tbc
+mas_assist_version:
+  9.0.x: 9.0.5    # tbc
+  8.10.x: 8.7.8   # No Update
+  8.11.x: 8.8.7   # No Update
+mas_hputilities_version:
+  9.0.x: ""       # Not Supported
+  8.10.x: 8.6.7   # tbc
+  8.11.x: ""      # Not Supported
+mas_iot_version:
+  9.0.x: 9.0.8    # tbc
+  8.10.x: 8.7.22  # tbc
+  8.11.x: 8.8.18  # tbc
+mas_manage_version:
+  9.1.x-feature: 9.1.0-pre.stable_10993 # tbc
+  9.0.x: 9.0.13   # tbc
+  8.10.x: 8.6.26  # tbc
+  8.11.x: 8.7.20  # tbc
+mas_monitor_version:
+  9.0.x: 9.0.9    # tbc
+  8.10.x: 8.10.19 # tbc
+  8.11.x: 8.11.17 # tbc
+mas_optimizer_version:
+  9.1.x-feature: 9.1.0-pre.stable_1943 # tbc
+  9.0.x: 9.0.10   # tbc
+  8.10.x: 8.4.17  # tbc
+  8.11.x: 8.5.16  # tbc
+mas_predict_version:
+  9.0.x: 9.0.7    # tbc
+  8.10.x: 8.8.8   # tbc
+  8.11.x: 8.9.10  # tbc
+mas_visualinspection_version:
+  9.1.x-feature: 9.1.0-pre.stable_2405 # tbc
+  9.0.x: 9.0.9    # tbc
+  8.10.x: 8.8.4   # No Update
+  8.11.x: 8.9.12  # tbc
+
+# Extra Images for UDS
+# ------------------------------------------------------------------------------
+uds_extras_version: 1.5.0
+
+# Extra Images for Mongo
+# ------------------------------------------------------------------------------
+mongo_extras_version_default: 7.0.12
+
+# 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.12
+
+# 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.2
+
+# Default Cloud Pak for Data version
+# ------------------------------------------------------------------------------
+cpd_product_version_default: 5.1.3

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

@@ -0,0 +1,40 @@
+---
+# Case bundle configuration for IBM Maximo Operator Catalog 250501
+# -----------------------------------------------------------------------------
+# 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:ec978dfaac709428efb7a6da1bccc645f6f09411f7f25506c75fbe33ac43dee8
+
+uds_version: 2.0.12                          # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
+sls_version: 3.11.1 # tbc                    # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
+tsm_version: 1.6.2  # tbc             # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
+
+
+# Maximo Application Suite
+# -----------------------------------------------------------------------------
+mas_core_version:
+  9.1.x-feature: 9.1.0-pre.stable_9718 # tbc
+  9.0.x: 9.0.11    # tbc
+  8.10.x: "" # Not Supported
+  8.11.x: "" # Not Supported
+mas_manage_version:
+  9.1.x-feature: 9.1.0-pre.stable_10993 # tbc
+  9.0.x: 9.0.13    # tbc
+  8.10.x: ""  # Not Supported
+  8.11.x: ""  # Not Supported
+
+# Extra Images for UDS
+# ------------------------------------------------------------------------------
+uds_extras_version: 1.5.0
+
+# Extra Images for Mongo
+# ------------------------------------------------------------------------------
+mongo_extras_version_default: 7.0.12
+
+# 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.12

test/src/test_data.py

@@ -26,7 +26,7 @@ def test_list_catalogs():
 def test_get_newest_catalog_tag():
     catalogTag = getNewestCatalogTag("amd64")
     # Reminder: update this test when adding a new catalog each month!
-    assert catalogTag == "v9-250501-amd64"
+    assert catalogTag == "v9-250605-amd64"
 
 
 def test_get_newest_catalog_tag_fail():