Skip to content

Commit 3319e30

Browse files
dureraanilprajapatiibmIanBodenparveenkumaribm
authored
[minor] Support June Catalog Update (#77)
Co-authored-by: Anil Prajapati <[email protected]> Co-authored-by: Anil Prajapati <[email protected]> Co-authored-by: Ian Boden <[email protected]> Co-authored-by: Parveen Kumar <[email protected]> Co-authored-by: Ian Boden <[email protected]>
1 parent f4a6e9c commit 3319e30

File tree

5 files changed

+212
-3
lines changed

5 files changed

+212
-3
lines changed

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ pipelineURL = launchUpgradePipeline(self.dynamicClient, instanceId)
3838
print(pipelineURL)
3939
```
4040

41-
4241
mas-devops-create-initial-users
4342
---------------------------------------------
4443

@@ -89,4 +88,4 @@ mas-devops-create-initial-users-for-saas \
8988
Example of initial_users secret:
9089
```json
9190
{"[email protected]":"primary,john1,smith1","[email protected]":"primary,john2,smith2","[email protected]":"secondary,john3,smith3"}
92-
```
91+
```

‎src/mas/devops/data/catalogs/v9-250624-amd64.yaml

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250624 (AMD64)
3+
# -----------------------------------------------------------------------------
4+
# In the future this won't be necessary as we'll be able to mirror from the
5+
# catalog itself, but not everything in the catalog supports this yet (including MAS)
6+
# so we need to use the CASE bundle mirror process still.
7+
8+
catalog_digest: sha256:cf03a9bcfacaf9c354078dfb2f97c166bfb1a6f0776680b52b7325cc469ffb31
9+
10+
# Dependencies
11+
# -----------------------------------------------------------------------------
12+
ibm_licensing_version: 4.2.14 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
13+
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)
14+
common_svcs_version_1: 4.11.0 # Additional version 4.11.0
15+
16+
cp4d_platform_version: 5.1.1 # Operator version 5.1.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
17+
ibm_zen_version: 6.1.1+20250218.180746.89 # For CPD5 ibm-zen has to be explicitily mirrored
18+
19+
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)
20+
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
21+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
22+
sls_version: 3.12.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
23+
tsm_version: 1.7.0 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
24+
dd_version: 1.1.19 # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
25+
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
26+
wsl_version: 10.2.0 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
27+
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
28+
wml_version: 10.2.0 # Operator version 5.0.0
29+
30+
# Why are these commented out?
31+
# ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version
32+
# datarefinery_build: +20240517.202103.146
33+
34+
spark_version: 10.2.0 # Operator version 7.3.0
35+
cognos_version: 27.2.0 # Operator version 25.0.0
36+
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)
37+
elasticsearch_version: 1.1.2570 # Operator version 1.1.2470
38+
39+
40+
# Maximo Application Suite
41+
# -----------------------------------------------------------------------------
42+
mas_core_version:
43+
9.1.x-feature: 9.1.0 # Updated
44+
9.1.x: 9.1.0 # Updated
45+
9.0.x: 9.0.12 # Updated
46+
8.10.x: 8.10.26 # Updated
47+
8.11.x: 8.11.23 # Updated
48+
mas_assist_version:
49+
9.1.x: 9.1.0 # Updated
50+
9.0.x: 9.0.6 # Updated
51+
8.10.x: 8.7.8 # No Update
52+
8.11.x: 8.8.7 # No Update
53+
mas_hputilities_version:
54+
9.1.x: "" # Not Supported
55+
9.0.x: "" # Not Supported
56+
8.10.x: 8.6.7 # No Update
57+
8.11.x: "" # Not Supported
58+
mas_iot_version:
59+
9.1.x: 9.1.0 # Updated
60+
9.0.x: 9.0.9 # Updated
61+
8.10.x: 8.7.23 # Updated
62+
8.11.x: 8.8.19 # Updated
63+
mas_manage_version:
64+
9.1.x-feature: 9.1.0 # Updated
65+
9.1.x: 9.1.0 # Updated
66+
9.0.x: 9.0.14 # Updated
67+
8.10.x: 8.6.27 # Updated
68+
8.11.x: 8.7.21 # Updated
69+
mas_monitor_version:
70+
9.1.x: 9.1.0 # Updated
71+
9.0.x: 9.0.10 # updated
72+
8.10.x: 8.10.20 # updated
73+
8.11.x: 8.11.18 # updated
74+
mas_optimizer_version:
75+
9.1.x-feature: 9.1.0 # Updated
76+
9.1.x: 9.1.0 # Updated
77+
9.0.x: 9.0.12 # Updated
78+
8.10.x: 8.4.19 # Updated
79+
8.11.x: 8.5.18 # Updated
80+
mas_predict_version:
81+
9.1.x: 9.1.0 # Updated
82+
9.0.x: 9.0.7 # No Update
83+
8.10.x: 8.8.8 # No Update
84+
8.11.x: 8.9.10 # No Update
85+
mas_visualinspection_version:
86+
9.1.x-feature: 9.1.0 # Updated
87+
9.1.x: 9.1.0 # Updated
88+
9.0.x: 9.0.9 # No Update
89+
8.10.x: 8.8.4 # No Update
90+
8.11.x: 8.9.12 # No Update
91+
mas_facilities_version:
92+
9.1.x: 9.1.0 # Updated
93+
9.0.x: "" # Not Supported
94+
8.10.x: "" # Not Supported
95+
8.11.x: "" # Not Supported
96+
97+
# Extra Images for UDS
98+
# ------------------------------------------------------------------------------
99+
uds_extras_version: 1.5.0
100+
101+
# Extra Images for Mongo
102+
# ------------------------------------------------------------------------------
103+
mongo_extras_version_default: 7.0.12
104+
105+
# Variables used to mirror additional mongo image versions
106+
mongo_extras_version_4: 4.4.21
107+
mongo_extras_version_5: 5.0.23
108+
mongo_extras_version_6: 6.0.12
109+
mongo_extras_version_7: 7.0.12
110+
111+
# Extra Images for Db2u
112+
# ------------------------------------------------------------------------------
113+
db2u_extras_version: 1.0.6 # No Update
114+
db2u_filter: db2
115+
116+
# Extra Images for IBM Watson Discovery
117+
# ------------------------------------------------------------------------------
118+
#wd_extras_version: 1.0.4
119+
120+
# Extra Images for Amlen
121+
# ------------------------------------------------------------------------------
122+
amlen_extras_version: 1.1.3
123+
124+
# Default Cloud Pak for Data version
125+
# ------------------------------------------------------------------------------
126+
cpd_product_version_default: 5.1.3

‎src/mas/devops/data/catalogs/v9-250624-ppc64le.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250624 (PPC)
3+
# -----------------------------------------------------------------------------
4+
# In the future this won't be necessary as we'll be able to mirror from the
5+
# catalog itself, but not everything in the catalog supports this yet (including MAS)
6+
# so we need to use the CASE bundle mirror process still.
7+
8+
catalog_digest: sha256:70b87e1fe64eb46c3796ce0aaa713b0ff3c902732078fc5297c28f7840f23d3e
9+
10+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
11+
sls_version: 3.12.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
12+
tsm_version: 1.6.2 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
13+
14+
15+
# Maximo Application Suite
16+
# -----------------------------------------------------------------------------
17+
mas_core_version:
18+
9.1.x-feature: 9.1.0 # Updated
19+
9.1.x: 9.1.0 # Updated
20+
9.0.x: 9.0.12 # Updated
21+
8.10.x: "" # Not Supported
22+
8.11.x: "" # Not Supported
23+
mas_manage_version:
24+
9.1.x-feature: 9.1.0 # Updated
25+
9.1.x: 9.1.0 # Updated
26+
9.0.x: 9.0.14 # Updated
27+
8.10.x: "" # Not Supported
28+
8.11.x: "" # Not Supported
29+
30+
# Extra Images for UDS
31+
# ------------------------------------------------------------------------------
32+
uds_extras_version: 1.5.0
33+
34+
# Extra Images for Mongo
35+
# ------------------------------------------------------------------------------
36+
mongo_extras_version_default: 7.0.12
37+
38+
# Variables used to mirror additional mongo image versions
39+
mongo_extras_version_4: 4.4.21
40+
mongo_extras_version_5: 5.0.23
41+
mongo_extras_version_6: 6.0.12
42+
mongo_extras_version_7: 7.0.12

‎src/mas/devops/data/catalogs/v9-250624-s390x.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250624 (Z)
3+
# -----------------------------------------------------------------------------
4+
# In the future this won't be necessary as we'll be able to mirror from the
5+
# catalog itself, but not everything in the catalog supports this yet (including MAS)
6+
# so we need to use the CASE bundle mirror process still.
7+
8+
catalog_digest: sha256:5748e21db7f688c8d80c5ab14e394e5575997cfc2e544d77b2173159dc237aba
9+
10+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
11+
sls_version: 3.12.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
12+
tsm_version: 1.7.0 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
13+
14+
15+
# Maximo Application Suite
16+
# -----------------------------------------------------------------------------
17+
mas_core_version:
18+
9.1.x-feature: 9.1.0 # Updated
19+
9.1.x: 9.1.0 # Updated
20+
9.0.x: 9.0.12 # Updated
21+
8.10.x: "" # Not Supported
22+
8.11.x: "" # Not Supported
23+
mas_manage_version:
24+
9.1.x-feature: 9.1.0 # Updated
25+
9.1.x: 9.1.0 # Updated
26+
9.0.x: 9.0.14 # Updated
27+
8.10.x: "" # Not Supported
28+
8.11.x: "" # Not Supported
29+
30+
# Extra Images for UDS
31+
# ------------------------------------------------------------------------------
32+
uds_extras_version: 1.5.0
33+
34+
# Extra Images for Mongo
35+
# ------------------------------------------------------------------------------
36+
mongo_extras_version_default: 7.0.12
37+
38+
# Variables used to mirror additional mongo image versions
39+
mongo_extras_version_4: 4.4.21
40+
mongo_extras_version_5: 5.0.23
41+
mongo_extras_version_6: 6.0.12
42+
mongo_extras_version_7: 7.0.12

‎test/src/test_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_list_catalogs():
2626
def test_get_newest_catalog_tag():
2727
catalogTag = getNewestCatalogTag("amd64")
2828
# Reminder: update this test when adding a new catalog each month!
29-
assert catalogTag == "v9-250501-amd64"
29+
assert catalogTag == "v9-250624-amd64"
3030

3131

3232
def test_get_newest_catalog_tag_fail():

0 commit comments

Comments
 (0)