From 00b5e04391a841dc207cf301428769c96a6bdb27 Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Mon, 10 Mar 2025 09:00:14 +0000 Subject: [PATCH 1/2] [patch] Add cp4d 5.1 into april catalog --- .../devops/data/catalogs/v9-250403-amd64.yaml | 100 ++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 src/mas/devops/data/catalogs/v9-250403-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-250403-amd64.yaml b/src/mas/devops/data/catalogs/v9-250403-amd64.yaml new file mode 100644 index 00000000..856bc3b8 --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-250403-amd64.yaml @@ -0,0 +1,100 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 250403 +# ----------------------------------------------------------------------------- +# 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:e67dd491f8d2478b5dde37967e860ceea7fdfb5a54fcd9bbe987dc1693dfcb63 + +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.11 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.10.0 # check once why we have 4.3.0 in all previous versions since so long it's 4.3.0 # Operator version 4.3.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) + +cp4d_platform_version: 5.1.0 #+20240716.101015 # Operator version 5.1.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) + +ibm_zen_version: 6.1.0+20241120.004836.207 # 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 # Updated # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.1 # No Update # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.16 # Updated # 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.0.0 +wml_version: 10.0.0 +spark_version: 10.0.0 +cognos_version: 27.0.0 # Operator version 27.0.0 +elasticsearch_version: 1.1.2470 # Operator version 1.1.2470 + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0-pre.stable_7790 # tbc + 9.0.x: 9.0.9 # No Update + 8.10.x: 8.10.23 # No Update + 8.11.x: 8.11.20 # No Update +mas_assist_version: + 9.0.x: 9.0.4 # No Update + 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.6 # No Update + 8.10.x: 8.7.20 # No Update + 8.11.x: 8.8.16 # No Update +mas_manage_version: + 9.1.x-feature: 9.1.0-pre.stable_9630 # tbc + 9.0.x: 9.0.10 # No Update + 8.10.x: 8.6.23 # No Update + 8.11.x: 8.7.17 # No Update +mas_monitor_version: + 9.0.x: 9.0.7 # No Update + 8.10.x: 8.10.17 # No Update + 8.11.x: 8.11.15 # No Update +mas_optimizer_version: + 9.1.x-feature: 9.1.0-pre.stable_1703 # tbc + 9.0.x: 9.0.8 # No Update + 8.10.x: 8.4.15 # No Update + 8.11.x: 8.5.14 # No Update +mas_predict_version: + 9.0.x: 9.0.5 # No Update + 8.10.x: 8.8.6 # No Update + 8.11.x: 8.9.8 # No Update +mas_visualinspection_version: + 9.1.x-feature: 9.1.0-pre.stable_2122 # tbc + 9.0.x: 9.0.7 # No Update + 8.10.x: 8.8.4 # No Update + 8.11.x: 8.9.10 # No Update + +# 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 + +# Extra Images for Amlen +# ------------------------------------------------------------------------------ +amlen_extras_version: 1.1.2 + +# Default Cloud Pak for Data version +# ------------------------------------------------------------------------------ +cpd_product_version_default: 5.1.0 From 58f3a4792dda369cba73e265cb859e8627191623 Mon Sep 17 00:00:00 2001 From: Ian Boden Date: Mon, 10 Mar 2025 10:29:23 +0000 Subject: [PATCH 2/2] fix 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 678c174a..ffec3890 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-250306-amd64" + assert catalogTag == "v9-250403-amd64" def test_get_newest_catalog_tag_fail():