Skip to content

Commit e37d4cf

Browse files
tomklapiscaktomklapiscak
committed
Merge remote-tracking branch 'origin/stable' into mascore5637
2 parents 2ff1a45 + 1d21abc commit e37d4cf

File tree

4 files changed

+155
-1
lines changed

4 files changed

+155
-1
lines changed

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

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250206
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:d2ffdec7d99dd4b0027d151b36b08b97efd58a1203bd0874fe782ad497198419
9+
10+
# Dependencies
11+
# -----------------------------------------------------------------------------
12+
ibm_licensing_version: 4.2.11 # Operator version 4.2.11 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-licensing)
13+
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)
14+
common_svcs_version_2: 4.8.0
15+
common_svcs_version_1: 4.3.0 #+20240702.100000 # common_svcs is a mess
16+
17+
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)
18+
19+
ibm_zen_version: 6.0.1+20240708.121250.32 # For CPD5 ibm-zen has to be explicitily mirrored
20+
21+
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)
22+
events_version: 5.0.1 # Operator version 5.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
23+
uds_version: 2.0.12 # Operator version 2.0.12 # sticking to 2.0.12 version # Please do Not Change
24+
sls_version: 3.11.1 # Updated # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
25+
tsm_version: 1.6.1 # No Update # Operator version 1.5.4 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases)
26+
dd_version: 1.1.16 # Updated # Operator version 1.1.14 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases)
27+
appconnect_version: 6.2.0 # Operator version 6.2.0 # sticking to 6.2.0 version # Please do Not Change
28+
wsl_version: 9.0.0 # Operator version 9.0.0
29+
wml_version: 9.0.0 # Operator version 5.0.0
30+
# ccs_build: +20240528.144404.460 # ibm-ccs from version 9.0.0 requires the build version
31+
# datarefinery_build: +20240517.202103.146
32+
spark_version: 9.0.0 # Operator version 5.0.0
33+
cognos_version: 25.0.0 # Operator version 25.0.0
34+
# 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)
35+
elasticsearch_version: 1.1.2470 # Operator version 1.1.2470
36+
37+
38+
# Maximo Application Suite
39+
# -----------------------------------------------------------------------------
40+
mas_core_version:
41+
9.1.x-feature: 9.1.0-pre.stable_8193 # Updated
42+
9.0.x: 9.0.9 # Updated
43+
8.10.x: 8.10.23 # Updated
44+
8.11.x: 8.11.20 # Updated
45+
mas_assist_version:
46+
9.0.x: 9.0.4 # Updated
47+
8.10.x: 8.7.8 # No Update
48+
8.11.x: 8.8.7 # No Update
49+
mas_hputilities_version:
50+
9.0.x: "" # Not Supported
51+
8.10.x: 8.6.7 # tbc
52+
8.11.x: "" # Not Supported
53+
mas_iot_version:
54+
9.0.x: 9.0.6 # Updated
55+
8.10.x: 8.7.20 # Updated
56+
8.11.x: 8.8.16 # Updated
57+
mas_manage_version:
58+
9.1.x-feature: 9.1.0-pre.stable_9992 # Updated
59+
9.0.x: 9.0.10 # Updated
60+
8.10.x: 8.6.23 # Updated
61+
8.11.x: 8.7.17 # Updated
62+
mas_monitor_version:
63+
9.0.x: 9.0.7 # Updated
64+
8.10.x: 8.10.17 # Updated
65+
8.11.x: 8.11.15 # Updated
66+
mas_optimizer_version:
67+
9.1.x-feature: 9.1.0-pre.stable_1813 # Updated
68+
9.0.x: 9.0.8 # Updated
69+
8.10.x: 8.4.15 # Updated
70+
8.11.x: 8.5.14 # Updated
71+
mas_predict_version:
72+
9.0.x: 9.0.5 # Updated
73+
8.10.x: 8.8.6 # Updated
74+
8.11.x: 8.9.8 # Updated
75+
mas_visualinspection_version:
76+
9.1.x-feature: 9.1.0-pre.stable_2246 # Updated
77+
9.0.x: 9.0.7 # Updated
78+
8.10.x: 8.8.4 # No Update
79+
8.11.x: 8.9.10 # Updated
80+
81+
# Extra Images for UDS
82+
# ------------------------------------------------------------------------------
83+
uds_extras_version: 1.5.0
84+
85+
# Extra Images for Mongo
86+
# ------------------------------------------------------------------------------
87+
mongo_extras_version_default: 7.0.12
88+
89+
# Variables used to mirror additional mongo image versions
90+
mongo_extras_version_4: 4.4.21
91+
mongo_extras_version_5: 5.0.23
92+
mongo_extras_version_6: 6.0.12
93+
mongo_extras_version_7: 7.0.12
94+
95+
# Extra Images for Db2u
96+
# ------------------------------------------------------------------------------
97+
db2u_extras_version: 1.0.6 # No Update
98+
db2u_filter: db2
99+
100+
# Extra Images for IBM Watson Discovery
101+
# ------------------------------------------------------------------------------
102+
#wd_extras_version: 1.0.4
103+
104+
# Extra Images for Amlen
105+
# ------------------------------------------------------------------------------
106+
amlen_extras_version: 1.1.2
107+
108+
# Default Cloud Pak for Data version
109+
# ------------------------------------------------------------------------------
110+
cpd_product_version_default: 5.0.0

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
# Case bundle configuration for IBM Maximo Operator Catalog 250206
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:a9f4a2a8aa4ec25b68ff6a1592c0773f730564a833b14eef5585a077e37c203a
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.11.1 # Updated # Operator version 3.10.0 (https://github.ibm.com/maximoappsuite/ibm-sls/releases)
12+
tsm_version: 1.6.1 # No Update # 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-pre.stable_8193 # Updated
19+
9.0.x: 9.0.8 # tbc
20+
8.10.x: "" # Not Supported
21+
8.11.x: "" # Not Supported
22+
mas_manage_version:
23+
9.1.x-feature: 9.1.0-pre.stable_9992 # Updated
24+
9.0.x: 9.0.9 # tbc
25+
8.10.x: "" # Not Supported
26+
8.11.x: "" # Not Supported
27+
28+
# Extra Images for UDS
29+
# ------------------------------------------------------------------------------
30+
uds_extras_version: 1.5.0
31+
32+
# Extra Images for Mongo
33+
# ------------------------------------------------------------------------------
34+
mongo_extras_version_default: 7.0.12
35+
36+
# Variables used to mirror additional mongo image versions
37+
mongo_extras_version_4: 4.4.21
38+
mongo_extras_version_5: 5.0.23
39+
mongo_extras_version_6: 6.0.12
40+
mongo_extras_version_7: 7.0.12

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,10 @@ spec:
616616
- name: mas_app_settings_server_bundles_size
617617
value: "{{ mas_app_settings_server_bundles_size }}"
618618
{%- endif %}
619+
{%- if is_full_manage is defined and is_full_manage != "" %}
620+
- name: is_full_manage
621+
value: "{{ is_full_manage }}"
622+
{%- endif %}
619623
{%- if mas_app_settings_base_lang is defined and mas_app_settings_base_lang != "" %}
620624
- name: mas_app_settings_base_lang
621625
value: "{{ mas_app_settings_base_lang }}"

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

3131

3232
def test_get_newest_catalog_tag_fail():

0 commit comments

Comments
 (0)