Skip to content

Commit 5ad0b5d

Browse files
IanBodenIanBoden
committed
Merge remote-tracking branch 'origin/stable' into ibai
2 parents 3366433 + 21d8d41 commit 5ad0b5d

6 files changed

Lines changed: 143 additions & 46 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ mas_facilities_version:
103103
8.10.x: "" # Not Supported
104104
8.11.x: "" # Not Supported
105105

106+
# Maximo AI Service
107+
# ------------------------------------------------------------------------------
106108
aiservice_version:
107109
9.1.x: "" # Not Ready Yet
108110

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,12 @@ mas_facilities_version:
9393
9.0.x: "" # Not Supported
9494
8.10.x: "" # Not Supported
9595
8.11.x: "" # Not Supported
96-
mas_aibroker_version:
97-
9.1.x: 9.1.4 # Updated
98-
9.0.x: 9.0.6
96+
97+
# Maximo AI Service
98+
# ------------------------------------------------------------------------------
99+
aiservice_version:
100+
9.1.x: "" # Not Ready Yet
101+
99102
# Extra Images for UDS
100103
# ------------------------------------------------------------------------------
101104
uds_extras_version: 1.5.0

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

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
# Case bundle configuration for IBM Maximo Operator Catalog 250624 (AMD64)
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250828 (AMD64)
33
# -----------------------------------------------------------------------------
44
# In the future this won't be necessary as we'll be able to mirror from the
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:cf03a9bcfacaf9c354078dfb2f97c166bfb1a6f0776680b52b7325cc469ffb31
8+
catalog_digest: sha256:adea6ac79804698267a11806cbc93b4a4a650fb3dac6ed619d590d9d8469bda3
99

1010
ocp_compatibility:
1111
- 4.15
@@ -15,17 +15,17 @@ ocp_compatibility:
1515

1616
# Dependencies
1717
# -----------------------------------------------------------------------------
18-
ibm_licensing_version: 4.2.14 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
18+
ibm_licensing_version: 4.2.16 # Operator version 4.2.14 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
1919
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)
2020
common_svcs_version_1: 4.11.0 # Additional version 4.11.0
2121

2222
cp4d_platform_version: 5.1.1 # Operator version 5.1.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-datacore/)
2323
ibm_zen_version: 6.1.1+20250218.180746.89 # For CPD5 ibm-zen has to be explicitily mirrored
2424

25-
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)
25+
db2u_version: 7.2.0+20250522.212407.15144 # Operator version 110509.0.2 to find the version 7.2.0, search CASE_VERSION in db2u, catalog.yaml into ibm-maximo-operator-catalog (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
2626
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
2727
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.0 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
28+
sls_version: 3.12.2 # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
2929
tsm_version: 1.7.0 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
3030
dd_version: 1.1.19 # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
3131
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
@@ -37,23 +37,23 @@ wml_version: 10.2.0 # Operator version 5.0.0
3737
# ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version
3838
# datarefinery_build: +20240517.202103.146
3939

40-
spark_version: 10.2.0 # Operator version 7.3.0
40+
spark_version: 10.2.0 # Operator version 7.3.0
4141
cognos_version: 27.2.0 # Operator version 25.0.0
4242
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.2570 # Operator version 1.1.2470
43+
elasticsearch_version: 1.1.2667 # Operator version 1.1.2667
4444

4545

4646
# Maximo Application Suite
4747
# -----------------------------------------------------------------------------
4848
mas_core_version:
4949
9.1.x-feature: 9.1.0 # Updated
50-
9.1.x: 9.1.0 # Updated
51-
9.0.x: 9.0.12 # Updated
52-
8.10.x: 8.10.26 # Updated
53-
8.11.x: 8.11.23 # Updated
50+
9.1.x: 9.1.2 # Updated
51+
9.0.x: 9.0.14 # Updated
52+
8.10.x: 8.10.28 # Updated
53+
8.11.x: 8.11.25 # Updated
5454
mas_assist_version:
55-
9.1.x: 9.1.0 # Updated
56-
9.0.x: 9.0.6 # Updated
55+
9.1.x: 9.1.1 # Updated
56+
9.0.x: 9.0.8 # Updated
5757
8.10.x: 8.7.8 # No Update
5858
8.11.x: 8.8.7 # No Update
5959
mas_hputilities_version:
@@ -62,60 +62,63 @@ mas_hputilities_version:
6262
8.10.x: 8.6.7 # No Update
6363
8.11.x: "" # Not Supported
6464
mas_iot_version:
65-
9.1.x: 9.1.0 # Updated
66-
9.0.x: 9.0.9 # Updated
67-
8.10.x: 8.7.23 # Updated
68-
8.11.x: 8.8.19 # Updated
65+
9.1.x: 9.1.2 # Updated
66+
9.0.x: 9.0.11 # Updated
67+
8.10.x: 8.7.25 # Updated
68+
8.11.x: 8.8.21 # Updated
6969
mas_manage_version:
70-
9.1.x-feature: 9.1.0 # Updated
71-
9.1.x: 9.1.0 # Updated
72-
9.0.x: 9.0.14 # Updated
73-
8.10.x: 8.6.27 # Updated
74-
8.11.x: 8.7.21 # Updated
70+
9.1.x-feature: 9.1.0 # No Update
71+
9.1.x: 9.1.2 # Updated
72+
9.0.x: 9.0.16 # Updated
73+
8.10.x: 8.6.29 # Updated
74+
8.11.x: 8.7.23 # Updated
7575
mas_monitor_version:
76-
9.1.x: 9.1.0 # Updated
77-
9.0.x: 9.0.10 # updated
78-
8.10.x: 8.10.20 # updated
79-
8.11.x: 8.11.18 # updated
76+
9.1.x: 9.1.2 # Updated
77+
9.0.x: 9.0.12 # Updated
78+
8.10.x: 8.10.22 # Updated
79+
8.11.x: 8.11.20 # Updated
8080
mas_optimizer_version:
81-
9.1.x-feature: 9.1.0 # Updated
82-
9.1.x: 9.1.0 # Updated
83-
9.0.x: 9.0.12 # Updated
84-
8.10.x: 8.4.19 # Updated
85-
8.11.x: 8.5.18 # Updated
81+
9.1.x-feature: 9.1.0 # tbc
82+
9.1.x: 9.1.3 # Updated
83+
9.0.x: 9.0.14 # Updated
84+
8.10.x: 8.4.21 # Updated
85+
8.11.x: 8.5.20 # Updated
8686
mas_predict_version:
87-
9.1.x: 9.1.0 # Updated
88-
9.0.x: 9.0.7 # No Update
89-
8.10.x: 8.8.8 # No Update
90-
8.11.x: 8.9.10 # No Update
87+
9.1.x: 9.1.1 # Updated
88+
9.0.x: 9.0.8 # Updated
89+
8.10.x: 8.8.9 # Updated
90+
8.11.x: 8.9.11 # Updated
9191
mas_visualinspection_version:
92-
9.1.x-feature: 9.1.0 # Updated
93-
9.1.x: 9.1.0 # Updated
94-
9.0.x: 9.0.9 # No Update
92+
9.1.x-feature: 9.1.0 # No Update
93+
9.1.x: 9.1.1 # Updated
94+
9.0.x: 9.0.11 # Updated
9595
8.10.x: 8.8.4 # No Update
96-
8.11.x: 8.9.12 # No Update
96+
8.11.x: 8.9.14 # Updated
9797
mas_facilities_version:
98-
9.1.x: 9.1.0 # Updated
98+
9.1.x: 9.1.2 # Updated
9999
9.0.x: "" # Not Supported
100100
8.10.x: "" # Not Supported
101101
8.11.x: "" # Not Supported
102102

103+
104+
# Maximo AI Service
105+
# ------------------------------------------------------------------------------
103106
aiservice_version:
104-
9.1.x: 9.1.3
107+
9.1.x: 9.1.5 # New
105108

106109
# Extra Images for UDS
107110
# ------------------------------------------------------------------------------
108111
uds_extras_version: 1.5.0
109112

110113
# Extra Images for Mongo
111114
# ------------------------------------------------------------------------------
112-
mongo_extras_version_default: 7.0.12
115+
mongo_extras_version_default: 7.0.22
113116

114117
# Variables used to mirror additional mongo image versions
115118
mongo_extras_version_4: 4.4.21
116119
mongo_extras_version_5: 5.0.23
117120
mongo_extras_version_6: 6.0.12
118-
mongo_extras_version_7: 7.0.12
121+
mongo_extras_version_7: 7.0.22
119122

120123
# Extra Images for Db2u
121124
# ------------------------------------------------------------------------------
@@ -137,3 +140,4 @@ cpd_product_version_default: 5.1.3
137140
# Extra Images for kmodels
138141
# ------------------------------------------------------------------------------
139142
kmodels_extras_version_default: 1.0.14
143+

‎src/mas/devops/data/catalogs/v9-250828-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 250828 (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:6a3e712a7f962c092e1a4bf33f7770a0c7ff16c6623be2c853bc9acb226d228e
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.2 # 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 # tbc
19+
9.1.x: 9.1.2 # Updated
20+
9.0.x: 9.0.14 # 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 # tbc
25+
9.1.x: 9.1.2 # Updated
26+
9.0.x: 9.0.16 # 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-250828-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 250828 (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:efad4bbc7791ba7ed28fccfb2cff44ea7ec49b29f05556762cc65f319fcc8e14
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.2 # 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 # tbc
19+
9.1.x: 9.1.2 # Updated
20+
9.0.x: 9.0.14 # 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 # tbc
25+
9.1.x: 9.1.2 # Updated
26+
9.0.x: 9.0.16 # 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/templates/pipelinerun-aiservice-install.yml.j2‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ spec:
230230
- name: minio_root_password
231231
value: "{{ minio_root_password }}"
232232

233+
# AI Service - ODH
234+
# -------------------------------------------------------------------------
235+
- name: aiservice_odh_model_deployment_type
236+
value: "{{ aiservice_odh_model_deployment_type }}"
233237

234238
# AI Service - watsonX
235239
# -------------------------------------------------------------------------

0 commit comments

Comments
 (0)