From 69a7f0fb9d90591388b781fbe7bb41e15ca9e878 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Mon, 30 Jun 2025 14:22:50 +0530 Subject: [PATCH 1/5] [minor] Support July Catalog Update --- .../devops/data/catalogs/v9-250731-amd64.yaml | 128 ++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-250731-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-250731-amd64.yaml b/src/mas/devops/data/catalogs/v9-250731-amd64.yaml new file mode 100644 index 0000000..da8d1ba --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250731-amd64.yaml @@ -0,0 +1,128 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250731 (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 + +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.14 # 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: 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.12.0 # 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.2570 # Operator version 1.1.2470 + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.12 # tbc + 8.10.x: 8.10.26 # tbc + 8.11.x: 8.11.23 # tbc +mas_assist_version: + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.6 # tbc + 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.0 # tbc + 9.0.x: 9.0.9 # tbc + 8.10.x: 8.7.23 # tbc + 8.11.x: 8.8.19 # tbc +mas_manage_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.14 # tbc + 8.10.x: 8.6.27 # tbc + 8.11.x: 8.7.21 # tbc +mas_monitor_version: + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.10 # tbc + 8.10.x: 8.10.20 # tbc + 8.11.x: 8.11.18 # tbc +mas_optimizer_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.12 # tbc + 8.10.x: 8.4.19 # tbc + 8.11.x: 8.5.18 # tbc +mas_predict_version: + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.7 # No Update + 8.10.x: 8.8.8 # No Update + 8.11.x: 8.9.10 # No Update +mas_visualinspection_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.9 # No Update + 8.10.x: 8.8.4 # No Update + 8.11.x: 8.9.12 # No Update +mas_facilities_version: + 9.1.x: 9.1.0 # tbc + 9.0.x: "" # Not Supported + 8.10.x: "" # Not Supported + 8.11.x: "" # Not Supported +mas_aibroker_version: + 9.1.x: 9.1.0 + 9.0.x: 9.0.6 +# 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.3 + +# Default Cloud Pak for Data version +# ------------------------------------------------------------------------------ +cpd_product_version_default: 5.1.3 From 203953cebd9075d7c71612776eb62782be18bc3a Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Mon, 30 Jun 2025 14:32:09 +0530 Subject: [PATCH 2/5] [patch] update assert catalogTag --- 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 f67e5ac..39832f2 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-250624-amd64" + assert catalogTag == "v9-250731-amd64" def test_get_newest_catalog_tag_fail(): From 040f2e8d73d7e9af0a02b3e571f04d23eba6a0c7 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Thu, 3 Jul 2025 17:53:10 +0530 Subject: [PATCH 3/5] [patch] add v9-250731-s390x.yaml --- .../devops/data/catalogs/v9-250731-s390x.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-250731-s390x.yaml diff --git a/src/mas/devops/data/catalogs/v9-250731-s390x.yaml b/src/mas/devops/data/catalogs/v9-250731-s390x.yaml new file mode 100644 index 0000000..74611b8 --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250731-s390x.yaml @@ -0,0 +1,42 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250731 (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.0 # 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) + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.12 # tbc + 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.0 # tbc + 9.0.x: 9.0.14 # 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 From 409dee19e79a8813fc7c4b4d607502da94a201e8 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Fri, 11 Jul 2025 15:04:50 +0530 Subject: [PATCH 4/5] [patch] added v9-250731-ppc64le.yaml --- .../data/catalogs/v9-250731-ppc64le.yaml | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml diff --git a/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml new file mode 100644 index 0000000..3a1b2cb --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml @@ -0,0 +1,42 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250731 (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.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.2 # 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 # tbc + 9.1.x: 9.1.0 # tbc + 9.0.x: 9.0.12 # tbc + 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.0 # tbc + 9.0.x: 9.0.14 # 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 From 07d03363a8d490bc1366df1ce0533b58c76d4290 Mon Sep 17 00:00:00 2001 From: Parveen Kumar Date: Tue, 15 Jul 2025 17:23:33 +0530 Subject: [PATCH 5/5] [patch] digest added --- src/mas/devops/data/catalogs/v9-250731-amd64.yaml | 2 +- src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml | 2 +- src/mas/devops/data/catalogs/v9-250731-s390x.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mas/devops/data/catalogs/v9-250731-amd64.yaml b/src/mas/devops/data/catalogs/v9-250731-amd64.yaml index da8d1ba..268c9b4 100644 --- a/src/mas/devops/data/catalogs/v9-250731-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-250731-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:7e16debec3092de0475de90bf807fccadf3d745852487e74084a5e9d332c82bb # Dependencies # ----------------------------------------------------------------------------- diff --git a/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml b/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml index 3a1b2cb..fdc0dea 100644 --- a/src/mas/devops/data/catalogs/v9-250731-ppc64le.yaml +++ b/src/mas/devops/data/catalogs/v9-250731-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:022fe71bd8384c4559a98aa6b19485b4699e6aa3bb0dc9e11eff195658f2ee95 uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.12.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) diff --git a/src/mas/devops/data/catalogs/v9-250731-s390x.yaml b/src/mas/devops/data/catalogs/v9-250731-s390x.yaml index 74611b8..1c9a52f 100644 --- a/src/mas/devops/data/catalogs/v9-250731-s390x.yaml +++ b/src/mas/devops/data/catalogs/v9-250731-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:fa57ca1bcfebe417e4243b3f2be2b5c467d756e7df4503544d6d762c1684993f uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change sls_version: 3.12.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)