From 809b9a2c2b188bda22c9ef6177b9f1a35db04c06 Mon Sep 17 00:00:00 2001 From: Rawa Resul Date: Sat, 30 Nov 2024 00:51:39 +0000 Subject: [PATCH 1/2] [patch] Add dec-ft catalog --- .../devops/data/catalogs/v9-dec-ft-amd64.yaml | 109 ++++++++++++++++++ test/src/test_data.py | 4 +- 2 files changed, 111 insertions(+), 2 deletions(-) create mode 100644 src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml b/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml new file mode 100644 index 00000000..2dd1668f --- /dev/null +++ b/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml @@ -0,0 +1,109 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 240625 +# ----------------------------------------------------------------------------- +# 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:d99e598a33b5b36f3532a647e1f870b5b66c53c4b221bc0a34838845e014a61a + +# Dependencies +# ----------------------------------------------------------------------------- +ibm_licensing_version: 4.2.10 # Operator version 4.2.7 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) +common_svcs_version: 4.7.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) +common_svcs_version_2: 4.8.0 +common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess + +cp4d_platform_version: 5.0.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) +# ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored +ibm_zen_version: 6.0.1 # 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.10.2 # Updated # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.6.1 # Updated # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.13 # Updated # Operator version 1.1.11 (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: 9.0.0 # Operator version 9.0.0 +wml_version: 9.0.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: 25.0.0 # Operator version 25.0.0 +couchdb_version: 1.0.14 # 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.2346 # Operator version 1.1.2238 + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 9.1.x-feature: 9.1.0-pre.stable_7051 + 9.0.x: 9.0.5 # Updated tbc + 8.10.x: 8.10.19 # Updated tbc + 8.11.x: 8.11.16 # Updated tbc +mas_assist_version: + 9.0.x: 9.0.3 # Updated + 8.10.x: 8.7.8 # Updated + 8.11.x: 8.8.7 # Updated +mas_hputilities_version: + 9.0.x: "" # Not Supported + 8.10.x: 8.6.7 # No Update tbc + 8.11.x: "" # Not Supported +mas_iot_version: + 9.0.x: 9.0.4 # Updated tbc + 8.10.x: 8.7.18 # Updated tbc + 8.11.x: 8.8.14 # Updated tbc +mas_manage_version: + 9.1.x-feature: 9.1.0-pre.stable_8949 + 9.0.x: 9.0.6 # Updated + 8.10.x: 8.6.20 # Updated + 8.11.x: 8.7.14 # Updated +mas_monitor_version: + 9.0.x: 9.0.4 # Updated tbc + 8.10.x: 8.10.14 # No Update tbc + 8.11.x: 8.11.12 # Updated tbc +mas_optimizer_version: + 9.1.x-feature: 9.1.0-pre.stable_1504 + 9.0.x: 9.0.5 # Updated + 8.10.x: 8.4.12 # Updated + 8.11.x: 8.5.11 # Updated +mas_predict_version: + 9.0.x: 9.0.3 # Updated + 8.10.x: 8.8.4 # No Update + 8.11.x: 8.9.6 # Updated +mas_visualinspection_version: + 9.1.x-feature: 9.1.0-pre.stable_1994 + 9.0.x: 9.0.5 # Updated + 8.10.x: 8.8.4 # No update + 8.11.x: 8.9.8 # Updated + +# 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 + +# 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.0.0 diff --git a/test/src/test_data.py b/test/src/test_data.py index 7563a673..9cfa985c 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -20,13 +20,13 @@ def test_catalog(): def test_list_catalogs(): catalogList = listCatalogTags("amd64") assert len(catalogList) > 0 - assert "v9-241205-amd64" in catalogList + assert "v9-dec-ft-amd64" in catalogList def test_get_newest_catalog_tag(): catalogTag = getNewestCatalogTag("amd64") # Reminder: update this test when adding a new catalog each month! - assert catalogTag == "v9-241205-amd64" + assert catalogTag == "v9-dec-ft-amd64" def test_get_newest_catalog_tag_fail(): From 12886088585848f3945094db20873f3335fcbc68 Mon Sep 17 00:00:00 2001 From: Rawa Resul Date: Mon, 2 Dec 2024 21:44:40 +0000 Subject: [PATCH 2/2] [patch] Cleanup --- .../devops/data/catalogs/v9-241205-amd64.yaml | 6 +- .../devops/data/catalogs/v9-dec-ft-amd64.yaml | 109 ------------------ test/src/test_data.py | 4 +- 3 files changed, 7 insertions(+), 112 deletions(-) delete mode 100644 src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml diff --git a/src/mas/devops/data/catalogs/v9-241205-amd64.yaml b/src/mas/devops/data/catalogs/v9-241205-amd64.yaml index e333d8e6..70cf9cd5 100644 --- a/src/mas/devops/data/catalogs/v9-241205-amd64.yaml +++ b/src/mas/devops/data/catalogs/v9-241205-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: sha256:7b4a08adbb34ca22a17e9c44ef98be20a0b23b4373da8d3dfcfcb4848cf80ab1 +catalog_digest: sha256:91a9833417beaef2076d94216c2a63616ef9e4924925b0d9c1ac0b68acff41f4 # Dependencies # ----------------------------------------------------------------------------- @@ -38,6 +38,7 @@ elasticsearch_version: 1.1.2346 # Operator version 1.1.2238 # Maximo Application Suite # ----------------------------------------------------------------------------- mas_core_version: + 9.1.x-feature: 9.1.0-pre.stable_7051 9.0.x: 9.0.5 # Updated tbc 8.10.x: 8.10.19 # Updated tbc 8.11.x: 8.11.16 # Updated tbc @@ -54,6 +55,7 @@ mas_iot_version: 8.10.x: 8.7.18 # Updated tbc 8.11.x: 8.8.14 # Updated tbc mas_manage_version: + 9.1.x-feature: 9.1.0-pre.stable_8949 9.0.x: 9.0.6 # Updated 8.10.x: 8.6.20 # Updated 8.11.x: 8.7.14 # Updated @@ -62,6 +64,7 @@ mas_monitor_version: 8.10.x: 8.10.14 # No Update tbc 8.11.x: 8.11.12 # Updated tbc mas_optimizer_version: + 9.1.x-feature: 9.1.0-pre.stable_1504 9.0.x: 9.0.5 # Updated 8.10.x: 8.4.12 # Updated 8.11.x: 8.5.11 # Updated @@ -70,6 +73,7 @@ mas_predict_version: 8.10.x: 8.8.4 # No Update 8.11.x: 8.9.6 # Updated mas_visualinspection_version: + 9.1.x-feature: 9.1.0-pre.stable_1994 9.0.x: 9.0.5 # Updated 8.10.x: 8.8.4 # No update 8.11.x: 8.9.8 # Updated diff --git a/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml b/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml deleted file mode 100644 index 2dd1668f..00000000 --- a/src/mas/devops/data/catalogs/v9-dec-ft-amd64.yaml +++ /dev/null @@ -1,109 +0,0 @@ ---- -# Case bundle configuration for IBM Maximo Operator Catalog 240625 -# ----------------------------------------------------------------------------- -# 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:d99e598a33b5b36f3532a647e1f870b5b66c53c4b221bc0a34838845e014a61a - -# Dependencies -# ----------------------------------------------------------------------------- -ibm_licensing_version: 4.2.10 # Operator version 4.2.7 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing) -common_svcs_version: 4.7.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) -common_svcs_version_2: 4.8.0 -common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess - -cp4d_platform_version: 5.0.0 #+20240716.101015 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/4.0.0%2B20231213.115030) -# ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored -ibm_zen_version: 6.0.1 # 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.10.2 # Updated # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) -tsm_version: 1.6.1 # Updated # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) -dd_version: 1.1.13 # Updated # Operator version 1.1.11 (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: 9.0.0 # Operator version 9.0.0 -wml_version: 9.0.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: 25.0.0 # Operator version 25.0.0 -couchdb_version: 1.0.14 # 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.2346 # Operator version 1.1.2238 - - -# Maximo Application Suite -# ----------------------------------------------------------------------------- -mas_core_version: - 9.1.x-feature: 9.1.0-pre.stable_7051 - 9.0.x: 9.0.5 # Updated tbc - 8.10.x: 8.10.19 # Updated tbc - 8.11.x: 8.11.16 # Updated tbc -mas_assist_version: - 9.0.x: 9.0.3 # Updated - 8.10.x: 8.7.8 # Updated - 8.11.x: 8.8.7 # Updated -mas_hputilities_version: - 9.0.x: "" # Not Supported - 8.10.x: 8.6.7 # No Update tbc - 8.11.x: "" # Not Supported -mas_iot_version: - 9.0.x: 9.0.4 # Updated tbc - 8.10.x: 8.7.18 # Updated tbc - 8.11.x: 8.8.14 # Updated tbc -mas_manage_version: - 9.1.x-feature: 9.1.0-pre.stable_8949 - 9.0.x: 9.0.6 # Updated - 8.10.x: 8.6.20 # Updated - 8.11.x: 8.7.14 # Updated -mas_monitor_version: - 9.0.x: 9.0.4 # Updated tbc - 8.10.x: 8.10.14 # No Update tbc - 8.11.x: 8.11.12 # Updated tbc -mas_optimizer_version: - 9.1.x-feature: 9.1.0-pre.stable_1504 - 9.0.x: 9.0.5 # Updated - 8.10.x: 8.4.12 # Updated - 8.11.x: 8.5.11 # Updated -mas_predict_version: - 9.0.x: 9.0.3 # Updated - 8.10.x: 8.8.4 # No Update - 8.11.x: 8.9.6 # Updated -mas_visualinspection_version: - 9.1.x-feature: 9.1.0-pre.stable_1994 - 9.0.x: 9.0.5 # Updated - 8.10.x: 8.8.4 # No update - 8.11.x: 8.9.8 # Updated - -# 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 - -# 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.0.0 diff --git a/test/src/test_data.py b/test/src/test_data.py index 9cfa985c..7563a673 100644 --- a/test/src/test_data.py +++ b/test/src/test_data.py @@ -20,13 +20,13 @@ def test_catalog(): def test_list_catalogs(): catalogList = listCatalogTags("amd64") assert len(catalogList) > 0 - assert "v9-dec-ft-amd64" in catalogList + assert "v9-241205-amd64" in catalogList def test_get_newest_catalog_tag(): catalogTag = getNewestCatalogTag("amd64") # Reminder: update this test when adding a new catalog each month! - assert catalogTag == "v9-dec-ft-amd64" + assert catalogTag == "v9-241205-amd64" def test_get_newest_catalog_tag_fail():