Skip to content

Commit 7a4e223

Browse files
jainyjosephjainyjoseph
committed
Merge branch 'update-251127' into mongo8013
2 parents fbcedba + 2587c6f commit 7a4e223

6 files changed

Lines changed: 153 additions & 11 deletions

File tree

‎bin/mas-devops-notify-slack‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def notifyProvisionFyre(channel: str, rc: int) -> bool:
4141
message = [
4242
SlackUtil.buildHeader(f":glyph-ok: Your IBM DevIT Fyre OCP cluster ({name}) is ready"),
4343
SlackUtil.buildSection(f"{url}"),
44-
SlackUtil.buildSection(f"- Username: `{username}`\n - Password: `{password}`"),
44+
SlackUtil.buildSection(f"- Username: `{username}`\n- Password: `{password}`"),
4545
SlackUtil.buildSection(f"<https://beta.fyre.ibm.com/development/vms|Fyre Dashboard>{toolchainLink}")
4646
]
4747
else:
@@ -56,9 +56,9 @@ def notifyProvisionFyre(channel: str, rc: int) -> bool:
5656

5757
if __name__ == "__main__":
5858
# If SLACK_TOKEN or SLACK_CHANNEL env vars are not set then silently exit taking no action
59-
SLACK_TOKEN = os.getenv("SLACK_TOKEN", None)
60-
SLACK_CHANNEL = os.getenv("SLACK_CHANNEL", None)
61-
if SLACK_TOKEN is None or SLACK_CHANNEL is None:
59+
SLACK_TOKEN = os.getenv("SLACK_TOKEN", "")
60+
SLACK_CHANNEL = os.getenv("SLACK_CHANNEL", "")
61+
if SLACK_TOKEN == "" or SLACK_CHANNEL == "":
6262
sys.exit(0)
6363

6464
# Initialize the properties we need

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# catalog itself, but not everything in the catalog supports this yet (including MAS)
66
# so we need to use the CASE bundle mirror process still.
77

8-
catalog_digest: sha256:801e7f3662049c86e078dedfea78728a2f8e5674744b8b954db7de93ebabbdeb
8+
catalog_digest: sha256:4358138a17be9c460d980a9f41aa99981adbc1a18f12e0ac5d3e7787d93891a7
99

1010
ocp_compatibility:
1111
- 4.15
@@ -103,22 +103,21 @@ mas_facilities_version:
103103
# Maximo AI Service
104104
# ------------------------------------------------------------------------------
105105
aiservice_version:
106-
9.1.x: 9.1.8 # Updated
106+
9.1.x: 9.1.7 # No Update
107107

108108
# Extra Images for UDS
109109
# ------------------------------------------------------------------------------
110110
uds_extras_version: 1.5.0
111111

112112
# Extra Images for Mongo
113113
# ------------------------------------------------------------------------------
114-
mongo_extras_version_default: 8.0.13
114+
mongo_extras_version_default: 7.0.23
115115

116116
# Variables used to mirror additional mongo image versions
117117
mongo_extras_version_4: 4.4.21
118118
mongo_extras_version_5: 5.0.23
119119
mongo_extras_version_6: 6.0.12
120120
mongo_extras_version_7: 7.0.23
121-
mongo_extras_version_8: 8.0.13
122121

123122
# Extra Images for Db2u
124123
# ------------------------------------------------------------------------------

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# catalog itself, but not everything in the catalog supports this yet (including MAS)
66
# so we need to use the CASE bundle mirror process still.
77

8-
catalog_digest: sha256:5d2804e69cfaaa754e664ef357a7c9dd87be25f504935e1d0c3328f5f2dc2a89
8+
catalog_digest: sha256:9903b6731465efb8ffe2b427aad773ad85a174d3b2323af1e2bf10f0c7747256
99

1010
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
1111
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# catalog itself, but not everything in the catalog supports this yet (including MAS)
66
# so we need to use the CASE bundle mirror process still.
77

8-
catalog_digest: sha256:d255bacdf12edb7009c6fe6ab5289aaf3c09c582e927f5498477d14204b2b236
8+
catalog_digest: sha256:799ac815a86985f5b3ab191d3939590cdc46e59c7f6aea0293fe4ea39bd754b2
99

1010
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
1111
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)

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

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 251127 (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: Need to update
9+
10+
ocp_compatibility:
11+
- 4.15
12+
- 4.16
13+
- 4.17
14+
- 4.18
15+
16+
# Dependencies
17+
# -----------------------------------------------------------------------------
18+
ibm_licensing_version: 4.2.17 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
19+
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)
20+
common_svcs_version_1: 4.11.0 # Additional version 4.11.0
21+
22+
cp4d_platform_version: 5.1.1 # Operator version 5.1.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
23+
ibm_zen_version: 6.1.1+20250218.180746.89 # For CPD5 ibm-zen has to be explicitily mirrored
24+
25+
db2u_version: 7.3.1+20250821.161005.16793 # Operator version 110509.0.6 to find the version 7.3.1+20250821.161005.16793, search db2u-operator digest on repo (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
26+
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
27+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
28+
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
29+
tsm_version: 1.7.1 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
30+
dd_version: 1.1.20 # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
31+
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
32+
wsl_version: 10.2.0 # used for wsl and wsl_runtimes unless wsl_runtimes_version also specified
33+
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
34+
wml_version: 10.2.0 # Operator version 5.0.0
35+
36+
# Why are these commented out?
37+
# ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version
38+
# datarefinery_build: +20240517.202103.146
39+
40+
spark_version: 10.2.0 # Operator version 7.3.0
41+
cognos_version: 27.2.0 # Operator version 25.0.0
42+
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)
43+
elasticsearch_version: 1.1.2667 # Operator version 1.1.2667
44+
45+
46+
# Maximo Application Suite
47+
# -----------------------------------------------------------------------------
48+
mas_core_version:
49+
9.2.x-feature: 9.2.0-pre.stable_2456 # Need to update
50+
9.1.x: 9.1.5 # Need to update
51+
9.0.x: 9.0.16 # Need to update
52+
8.10.x: 8.10.30 # Need to update
53+
8.11.x: 8.11.27 # Need to update
54+
mas_assist_version:
55+
9.1.x: 9.1.4 # Need to update
56+
9.0.x: 9.0.10 # Need to update
57+
8.10.x: 8.7.8 # No Update
58+
8.11.x: 8.8.7 # No Update
59+
mas_hputilities_version:
60+
9.1.x: "" # Not Supported
61+
9.0.x: "" # Not Supported
62+
8.10.x: 8.6.7 # Need to update
63+
8.11.x: "" # Not Supported
64+
mas_iot_version:
65+
9.1.x: 9.1.4 # Need to update
66+
9.0.x: 9.0.13 # Need to update
67+
8.10.x: 8.7.27 # Need to update
68+
8.11.x: 8.8.23 # Need to update
69+
mas_manage_version:
70+
9.2.x-feature: 9.2.0-pre.stable_14287 # Need to update
71+
9.1.x: 9.1.5 # Need to update
72+
9.0.x: 9.0.18 # Need to update
73+
8.10.x: 8.6.31 # Need to update
74+
8.11.x: 8.7.25 # Need to update
75+
mas_monitor_version:
76+
9.1.x: 9.1.4 # Need to update
77+
9.0.x: 9.0.14 # Need to update
78+
8.10.x: 8.10.24 # Need to update
79+
8.11.x: 8.11.22 # Need to update
80+
mas_optimizer_version:
81+
9.2.x-feature: 9.2.0-pre.stable_2382 # Need to update
82+
9.1.x: 9.1.5 # Need to update
83+
9.0.x: 9.0.16 # Need to update
84+
8.10.x: 8.4.23 # Need to update
85+
8.11.x: 8.5.22 # Need to update
86+
mas_predict_version:
87+
9.1.x: 9.1.3 # Need to update
88+
9.0.x: 9.0.10 # Need to update
89+
8.10.x: 8.8.11 # Need to update
90+
8.11.x: 8.9.13 # Need to update
91+
mas_visualinspection_version:
92+
9.1.x: 9.1.3 # Need to update
93+
9.0.x: 9.0.13 # Need to update
94+
8.10.x: 8.8.4 # No Update
95+
8.11.x: 8.9.16 # Need to update
96+
mas_facilities_version:
97+
9.1.x: 9.1.4 # Need to update
98+
9.0.x: "" # Not Supported
99+
8.10.x: "" # Not Supported
100+
8.11.x: "" # Not Supported
101+
102+
103+
# Maximo AI Service
104+
# ------------------------------------------------------------------------------
105+
aiservice_version:
106+
9.1.x: 9.1.7 # Need to update
107+
108+
# Extra Images for UDS
109+
# ------------------------------------------------------------------------------
110+
uds_extras_version: 1.5.0
111+
112+
# Extra Images for Mongo
113+
# ------------------------------------------------------------------------------
114+
mongo_extras_version_default: 7.0.23
115+
116+
# Variables used to mirror additional mongo image versions
117+
mongo_extras_version_4: 4.4.21
118+
mongo_extras_version_5: 5.0.23
119+
mongo_extras_version_6: 6.0.12
120+
mongo_extras_version_7: 7.0.23
121+
122+
# Extra Images for Db2u
123+
# ------------------------------------------------------------------------------
124+
db2u_extras_version: 1.0.6 # No Update
125+
db2u_filter: db2
126+
127+
# Extra Images for IBM Watson Discovery
128+
# ------------------------------------------------------------------------------
129+
#wd_extras_version: 1.0.4
130+
131+
# Extra Images for Amlen
132+
# ------------------------------------------------------------------------------
133+
amlen_extras_version: 1.1.3
134+
135+
# Default Cloud Pak for Data version
136+
# ------------------------------------------------------------------------------
137+
cpd_product_version_default: 5.1.3
138+
139+
# Extra Images for kmodels
140+
# ------------------------------------------------------------------------------
141+
kmodels_extras_version_default: 1.0.14
142+
143+
manage_extras_913: 9.1.3

‎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-251030-amd64"
29+
assert catalogTag == "v9-251127-amd64"
3030

3131

3232
def test_get_newest_catalog_tag_fail():

0 commit comments

Comments
 (0)