From 3682422c4c9cf33b9507789ca824f950d9134ed1 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 2 Sep 2025 12:00:20 +0530 Subject: [PATCH 1/4] [minor] Support September-250902 Catalog Update --- .../devops/data/catalogs/v9-250902-amd64.yaml | 143 ++++++++++++++++++ .../data/catalogs/v9-250902-ppc64le.yaml | 42 +++++ .../devops/data/catalogs/v9-250902-s390x.yaml | 42 +++++ 3 files changed, 227 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-250902-amd64.yaml create mode 100644 src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml create mode 100644 src/mas/devops/data/catalogs/v9-250902-s390x.yaml diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml new file mode 100644 index 00000000..dcea2bfc --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml @@ -0,0 +1,143 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250902 (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: TBc + +ocp_compatibility: + - 4.15 + - 4.16 + - 4.17 + - 4.18 + +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.16 # 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.2.0+20250522.212407.15144 # Operator version 110509.0.2 to find the version 7.2.0, 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.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) +dd_version: 1.1.19 # 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.1.x-feature: 9.1.0 # Updated + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.14 # Updated + 8.10.x: 8.10.28 # Updated + 8.11.x: 8.11.25 # Updated +mas_assist_version: + 9.1.x: 9.1.1 # Updated + 9.0.x: 9.0.8 # 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.2 # Updated + 9.0.x: 9.0.11 # Updated + 8.10.x: 8.7.25 # Updated + 8.11.x: 8.8.21 # Updated +mas_manage_version: + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.16 # Updated + 8.10.x: 8.6.29 # Updated + 8.11.x: 8.7.23 # Updated +mas_monitor_version: + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.12 # Updated + 8.10.x: 8.10.22 # Updated + 8.11.x: 8.11.20 # Updated +mas_optimizer_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.3 # Updated + 9.0.x: 9.0.14 # Updated + 8.10.x: 8.4.21 # Updated + 8.11.x: 8.5.20 # Updated +mas_predict_version: + 9.1.x: 9.1.1 # Updated + 9.0.x: 9.0.8 # Updated + 8.10.x: 8.8.9 # Updated + 8.11.x: 8.9.11 # Updated +mas_visualinspection_version: + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.1 # Updated + 9.0.x: 9.0.11 # Updated + 8.10.x: 8.8.4 # No Update + 8.11.x: 8.9.14 # Updated +mas_facilities_version: + 9.1.x: 9.1.2 # 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.5 # New + +# Extra Images for UDS +# ------------------------------------------------------------------------------ +uds_extras_version: 1.5.0 + +# Extra Images for Mongo +# ------------------------------------------------------------------------------ +mongo_extras_version_default: 7.0.22 + +# 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.22 + +# 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/data/catalogs/v9-250902-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml new file mode 100644 index 00000000..47c3f016 --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml @@ -0,0 +1,42 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250902 (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: TBC + +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) +db2u_version: 7.2.0+20250522.212407.15144 # Operator version 110509.0.2 to find the version 7.2.0, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.14 # Updated + 8.10.x: "" # Not Supported + 8.11.x: "" # Not Supported +mas_manage_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.16 # Updated + 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 diff --git a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml new file mode 100644 index 00000000..8b9a712e --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml @@ -0,0 +1,42 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250902 (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: TBC + +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) +db2u_version: 7.2.0+20250522.212407.15144 # Operator version 110509.0.2 to find the version 7.2.0, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.14 # Updated + 8.10.x: "" # Not Supported + 8.11.x: "" # Not Supported +mas_manage_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.2 # Updated + 9.0.x: 9.0.16 # Updated + 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 From 7445c446f720bedd376a0232fd1add4d63ae472e Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 2 Sep 2025 14:45:09 +0530 Subject: [PATCH 2/4] [patch] digest update --- src/mas/devops/data/catalogs/v9-250902-amd64.yaml | 4 ++-- src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml | 2 +- src/mas/devops/data/catalogs/v9-250902-s390x.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml index dcea2bfc..f09f8fbd 100644 --- a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml @@ -5,7 +5,7 @@ # 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: TBc +catalog_digest: sha256:6a18fa3fac8c9f826f18b4f2aeacbe97f180a1f2e8efd4bae5846f0b2b359752 ocp_compatibility: - 4.15 @@ -104,7 +104,7 @@ mas_facilities_version: # Maximo AI Service # ------------------------------------------------------------------------------ aiservice_version: - 9.1.x: 9.1.5 # New + 9.1.x: 9.1.6 # New # Extra Images for UDS # ------------------------------------------------------------------------------ diff --git a/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml index 47c3f016..cb4c18b9 100644 --- a/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml @@ -5,7 +5,7 @@ # 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: TBC +catalog_digest: sha256:df9bdaa918550e2279c9269c54f2700ea98d9c537b1b57468bd16041f363fafe 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) diff --git a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml index 8b9a712e..2acaf291 100644 --- a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml @@ -5,7 +5,7 @@ # 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: TBC +catalog_digest: sha256:142080295b0bfc53e738c94b1b49cb7f6ba1668ab7a010cf214f32e20f396664 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) From 7c90db668fcab4b002903a235d57f0bf4c0b3903 Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 2 Sep 2025 18:36:34 +0530 Subject: [PATCH 3/4] [patch] update latest catalog into test --- test/src/test_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/test_data.py b/test/src/test_data.py index a4669178..b22a744b 100644 --- a/test/src/test_data.py +++ b/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-250828-amd64" + assert catalogTag == "v9-250902-amd64" def test_get_newest_catalog_tag_fail(): From 09f264082ec8988f6b866cb8dbfdab9486eb16ac Mon Sep 17 00:00:00 2001 From: Anil Prajapati Date: Tue, 2 Sep 2025 19:07:31 +0530 Subject: [PATCH 4/4] [patch] update comments update and no update --- .../devops/data/catalogs/v9-250902-amd64.yaml | 66 +++++++++---------- .../data/catalogs/v9-250902-ppc64le.yaml | 12 ++-- .../devops/data/catalogs/v9-250902-s390x.yaml | 12 ++-- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml index f09f8fbd..53b0e23d 100644 --- a/src/mas/devops/data/catalogs/v9-250902-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-amd64.yaml @@ -46,14 +46,14 @@ elasticsearch_version: 1.1.2667 # Operator version 1.1.2667 # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0 # Updated - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.14 # Updated - 8.10.x: 8.10.28 # Updated - 8.11.x: 8.11.25 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.14 # No Update + 8.10.x: 8.10.28 # No Update + 8.11.x: 8.11.25 # No Update mas_assist_version: - 9.1.x: 9.1.1 # Updated - 9.0.x: 9.0.8 # Updated + 9.1.x: 9.1.1 # No Update + 9.0.x: 9.0.8 # No Update 8.10.x: 8.7.8 # No Update 8.11.x: 8.8.7 # No Update mas_hputilities_version: @@ -62,40 +62,40 @@ mas_hputilities_version: 8.10.x: 8.6.7 # No Update 8.11.x: "" # Not Supported mas_iot_version: - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.11 # Updated - 8.10.x: 8.7.25 # Updated - 8.11.x: 8.8.21 # Updated + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.11 # No Update + 8.10.x: 8.7.25 # No Update + 8.11.x: 8.8.21 # No Update mas_manage_version: 9.1.x-feature: 9.1.0 # No Update - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.16 # Updated - 8.10.x: 8.6.29 # Updated - 8.11.x: 8.7.23 # Updated + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.16 # No Update + 8.10.x: 8.6.29 # No Update + 8.11.x: 8.7.23 # No Update mas_monitor_version: - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.12 # Updated - 8.10.x: 8.10.22 # Updated - 8.11.x: 8.11.20 # Updated + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.12 # No Update + 8.10.x: 8.10.22 # No Update + 8.11.x: 8.11.20 # No Update mas_optimizer_version: - 9.1.x-feature: 9.1.0 # tbc - 9.1.x: 9.1.3 # Updated - 9.0.x: 9.0.14 # Updated - 8.10.x: 8.4.21 # Updated - 8.11.x: 8.5.20 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.3 # No Update + 9.0.x: 9.0.14 # No Update + 8.10.x: 8.4.21 # No Update + 8.11.x: 8.5.20 # No Update mas_predict_version: - 9.1.x: 9.1.1 # Updated - 9.0.x: 9.0.8 # Updated - 8.10.x: 8.8.9 # Updated - 8.11.x: 8.9.11 # Updated + 9.1.x: 9.1.1 # No Update + 9.0.x: 9.0.8 # No Update + 8.10.x: 8.8.9 # No Update + 8.11.x: 8.9.11 # No Update mas_visualinspection_version: 9.1.x-feature: 9.1.0 # No Update - 9.1.x: 9.1.1 # Updated - 9.0.x: 9.0.11 # Updated + 9.1.x: 9.1.1 # No Update + 9.0.x: 9.0.11 # No Update 8.10.x: 8.8.4 # No Update - 8.11.x: 8.9.14 # Updated + 8.11.x: 8.9.14 # No Update mas_facilities_version: - 9.1.x: 9.1.2 # Updated + 9.1.x: 9.1.2 # No Update 9.0.x: "" # Not Supported 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported @@ -104,7 +104,7 @@ mas_facilities_version: # Maximo AI Service # ------------------------------------------------------------------------------ aiservice_version: - 9.1.x: 9.1.6 # New + 9.1.x: 9.1.6 # Updated # Extra Images for UDS # ------------------------------------------------------------------------------ diff --git a/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml index cb4c18b9..7600f3e9 100644 --- a/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-ppc64le.yaml @@ -15,15 +15,15 @@ db2u_version: 7.2.0+20250522.212407.15144 # Operator version 110509.0.2 to fi # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0 # tbc - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.14 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.14 # No Update 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported mas_manage_version: - 9.1.x-feature: 9.1.0 # tbc - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.16 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.16 # No Update 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported diff --git a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml index 2acaf291..9c1f245f 100644 --- a/src/mas/devops/data/catalogs/v9-250902-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250902-s390x.yaml @@ -15,15 +15,15 @@ db2u_version: 7.2.0+20250522.212407.15144 # Operator version 110509.0.2 to fi # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: - 9.1.x-feature: 9.1.0 # tbc - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.14 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.14 # No Update 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported mas_manage_version: - 9.1.x-feature: 9.1.0 # tbc - 9.1.x: 9.1.2 # Updated - 9.0.x: 9.0.16 # Updated + 9.1.x-feature: 9.1.0 # No Update + 9.1.x: 9.1.2 # No Update + 9.0.x: 9.0.16 # No Update 8.10.x: "" # Not Supported 8.11.x: "" # Not Supported