Skip to content

Commit 1adcc40

Browse files
committed
Merge remote-tracking branch 'origin/stable' into mongo8013
2 parents be0cb6a + cee9976 commit 1adcc40

2 files changed

Lines changed: 47 additions & 0 deletions

File tree

src/mas/devops/data/catalogs/v9-250925-ppc64le.yaml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,51 @@
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:3f7809233f72bf6007e7099a1c38a3577e1ffb0197a29b891a24fef007a8dcf7
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.1 # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
13+
db2u_version: 7.3.1+20250821.161005.16793 # 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)
14+
15+
# Maximo Application Suite
16+
# -----------------------------------------------------------------------------
17+
mas_core_version:
18+
9.2.x-feature: 9.2.0-pre.stable_11883 # Updated
19+
9.1.x-feature: 9.1.0 # No Update
20+
9.1.x: 9.1.4 # Updated
21+
9.0.x: 9.0.15 # Updated
22+
8.10.x: "" # Not Supported
23+
8.11.x: "" # Not Supported
24+
mas_manage_version:
25+
9.2.x-feature: 9.2.0-pre.stable_13752 # Updated
26+
9.1.x-feature: 9.1.0 # No Update
27+
9.1.x: 9.1.2 # No Update
28+
9.0.x: 9.0.17 # Updated
29+
8.10.x: "" # Not Supported
30+
8.11.x: "" # Not Supported
31+
32+
# Extra Images for UDS
33+
# ------------------------------------------------------------------------------
34+
uds_extras_version: 1.5.0
35+
36+
# Extra Images for Mongo
37+
# ------------------------------------------------------------------------------
38+
mongo_extras_version_default: 7.0.12
39+
40+
# Variables used to mirror additional mongo image versions
41+
mongo_extras_version_4: 4.4.21
42+
mongo_extras_version_5: 5.0.23
43+
mongo_extras_version_6: 6.0.12
44+
mongo_extras_version_7: 7.0.12
45+
46+
---
47+
# Case bundle configuration for IBM Maximo Operator Catalog 250925 (PPC)
48+
# -----------------------------------------------------------------------------
49+
# In the future this won't be necessary as we'll be able to mirror from the
50+
# catalog itself, but not everything in the catalog supports this yet (including MAS)
51+
# so we need to use the CASE bundle mirror process still.
52+
853
catalog_digest: sha256:cd7d82bc2467d8ff62a0a4a1b09e90658e94dd96d00bb917e5bdced80b0d0411
954

1055
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change

src/mas/devops/templates/pipelinerun-aiservice-install.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ spec:
245245
value: "{{ aiservice_watsonxai_project_id }}"
246246
- name: aiservice_watsonx_action
247247
value: "{{ aiservice_watsonx_action }}"
248+
- name: aiservice_watsonxai_ca_crt
249+
value: "{{ aiservice_watsonxai_ca_crt }}"
248250

249251
workspaces:
250252
# The generated configuration files

0 commit comments

Comments
 (0)