Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b03481b
[patch] added v9-250109-amd64.yml file
prveenkumr Dec 16, 2024
100bae4
[patch] digest update
prveenkumr Dec 16, 2024
507254a
[minor] update test data to add 250109 catalog
anilprajapatiibm Dec 16, 2024
f1d828b
[patch] add s390x arch catalog metadata
anilprajapatiibm Dec 16, 2024
5f19aed
[patch] update catalog digests
anilprajapatiibm Dec 16, 2024
e2550f7
[patch] update digest, predict and aibrocker
anilprajapatiibm Dec 18, 2024
cba1b2b
Merge branch 'stable' into update-250109
anilprajapatiibm Dec 18, 2024
7b56425
[patch] add uds into s390x catalog
anilprajapatiibm Dec 20, 2024
8b2b0e8
Merge branch 'stable' into update-250109
prveenkumr Dec 20, 2024
8f35cf1
[patch] Digest & MSO app version updated
prveenkumr Dec 20, 2024
11b22f6
[patch] update promoted apps
anilprajapatiibm Dec 23, 2024
2505fd3
[patch] update catalog digest
anilprajapatiibm Dec 23, 2024
5ca6622
[patch] add manage into s390x
anilprajapatiibm Dec 23, 2024
8438c69
[patch] remove 811 810 from s390x
anilprajapatiibm Dec 23, 2024
64bf11d
[patch] update digest
anilprajapatiibm Dec 24, 2024
275cb7d
[patch] update ibm-mas dd sls and manage fc
anilprajapatiibm Dec 24, 2024
0418f77
[patch] update catalog digest
anilprajapatiibm Dec 24, 2024
e65d78f
[patch] update catalog
anilprajapatiibm Dec 24, 2024
c28b420
[patch] update common svc to 4.8.0
anilprajapatiibm Dec 30, 2024
3e9eefe
[patch] set couchdb_version to 1.0.13
anilprajapatiibm Dec 30, 2024
3dd3cde
[patch] comment couch db, and revert common svc to 4.7.0
anilprajapatiibm Dec 30, 2024
b266f91
[patch] update catalog digest after refresh manage fc
anilprajapatiibm Jan 7, 2025
64dfad6
Merge branch 'stable' into update-250109
anilprajapatiibm Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 109 additions & 0 deletions src/mas/devops/data/catalogs/v9-250109-amd64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
---
# Case bundle configuration for IBM Maximo Operator Catalog 250109
# -----------------------------------------------------------------------------
# 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:028f32213d3f14405eda7e78aaec28411688272f3358c5a34f6ebed6cf46c4c3

# 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.3 # 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.14 # 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_7331 # Updated
9.0.x: 9.0.7 # Updated
8.10.x: 8.10.21 # Updated
8.11.x: 8.11.18 # Updated
mas_assist_version:
9.0.x: 9.0.3 # 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 # No Update
8.11.x: "" # Not Supported
mas_iot_version:
9.0.x: 9.0.4 # No Update
8.10.x: 8.7.18 # No Update
8.11.x: 8.8.14 # No Update
mas_manage_version:
9.1.x-feature: 9.1.0-pre.stable_9224 # Updated
9.0.x: 9.0.8 # Updated
8.10.x: 8.6.21 # Updated
8.11.x: 8.7.15 # Updated
mas_monitor_version:
9.0.x: 9.0.5 # Updated
8.10.x: 8.10.15 # Updated
8.11.x: 8.11.13 # Updated
mas_optimizer_version:
9.1.x-feature: 9.1.0-pre.stable_1628 # Updated
9.0.x: 9.0.6 # Updated
8.10.x: 8.4.13 # Updated
8.11.x: 8.5.12 # Updated
mas_predict_version:
9.0.x: 9.0.4 # Updated
8.10.x: 8.8.5 # Updated
8.11.x: 8.9.7 # Updated
mas_visualinspection_version:
9.1.x-feature: 9.1.0-pre.stable_1994 # No Update
9.0.x: 9.0.5 # No Update
8.10.x: 8.8.4 # No Update
8.11.x: 8.9.8 # 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

# 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
40 changes: 40 additions & 0 deletions src/mas/devops/data/catalogs/v9-250109-s390x.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
---
# Case bundle configuration for IBM Maximo Operator Catalog 250109
# -----------------------------------------------------------------------------
# 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:82a017b04ac8f15b14719e77435e1000046e8d90c24fa7fce45421f4e289d0fd

uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
sls_version: 3.10.3 # 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)


# Maximo Application Suite
# -----------------------------------------------------------------------------
mas_core_version:
9.1.x-feature: 9.1.0-pre.stable_7331 # Updated
9.0.x: 9.0.7 # Updated
8.10.x: "" # Not Supported
8.11.x: "" # Not Supported
mas_manage_version:
9.1.x-feature: 9.1.0-pre.stable_9224 # Updated
9.0.x: 9.0.8 # 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
4 changes: 2 additions & 2 deletions test/src/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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-250109-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-250109-amd64"


def test_get_newest_catalog_tag_fail():
Expand Down
Loading