diff --git a/build/bin/build-collection.sh b/build/bin/build-collection.sh index bf08fec59a..2d2d3c9dbe 100644 --- a/build/bin/build-collection.sh +++ b/build/bin/build-collection.sh @@ -14,14 +14,14 @@ cat $GITHUB_WORKSPACE/ibm/mas_devops/galaxy.yml # Update all the placeholders in the playbooks find ibm/mas_devops/playbooks -type f -name '*.yml' -exec sed -i \ - -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240405-amd64/g' \ - -e 's/@@MAS_LATEST_CATALOG@@/v8-240430-amd64/g' \ + -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240430-amd64/g' \ + -e 's/@@MAS_LATEST_CATALOG@@/v8-240528-amd64/g' \ {} \; # Update all the placeholders in the docs find docs/playbooks -type f -name '*.md' -exec sed -i \ - -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240405-amd64/g' \ - -e 's/@@MAS_LATEST_CATALOG@@/v8-240430-amd64/g' \ + -e 's/@@MAS_PREVIOUS_CATALOG@@/v8-240430-amd64/g' \ + -e 's/@@MAS_LATEST_CATALOG@@/v8-240528-amd64/g' \ {} \; cd $GITHUB_WORKSPACE/ibm/mas_devops diff --git a/ibm/mas_devops/common_vars/casebundles/v8-240528-amd64.yml b/ibm/mas_devops/common_vars/casebundles/v8-240528-amd64.yml new file mode 100644 index 0000000000..61271033a2 --- /dev/null +++ b/ibm/mas_devops/common_vars/casebundles/v8-240528-amd64.yml @@ -0,0 +1,103 @@ +--- +# Case bundle configuration for IBM Maximo Operator Catalog 240528 +# ----------------------------------------------------------------------------- +# In the future this won't be necessary as we'll be able to mirror from the +# catalog itself, but not everything in the catalog supports this yet (including MAS) +# so we need to use the CASE bundle mirror process still. + +catalog_digest: sha256:5ca51934b3aec978e261e6dc9704fd3d46a308010bd6c86252788d69aac3fa9f + +# Dependencies +# ----------------------------------------------------------------------------- +common_svcs_version: 1.19.13 # Operator version 3.23.13 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services) +db2u_version: 5.6.2 # Operator version 110509.0.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator) +events_version: 5.0.0 # Operator version 5.0.0 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator) +uds_version: 2.0.12 # Operator version 2.0.12 +sls_version: 3.9.1 # Operator version 3.9.1 (https://github.ibm.com/maximoappsuite/ibm-sls/releases) +tsm_version: 1.5.3 # Operator version 1.5.3 (https://github.ibm.com/maximoappsuite/ibm-truststore-mgr/releases) +dd_version: 1.1.8 # Operator version 1.1.8 (https://github.ibm.com/maximoappsuite/ibm-data-dictionary/releases) +appconnect_version: 6.2.0 # Operator version 6.2.0 +cp4d_platform_version: 2.9.0+20230524.165553 # Operator version 3.8.0 +wsl_version: 6.5.0 # Operator version 6.5.0 +wml_version: 6.5.0 # Operator version 3.5.0 +spark_version: 6.5.0 # Operator version 3.5.0 +cognos_version: 23.5.0 # Operator version 23.5.0 + +# Watson discovery and its dependencies +# Match corresponding case version for default versions in the catalog source +# ----------------------------------------------------------------------------- +wd_version: 5.5.0 # Operator version 4.6.5 +model_train_version: 1.2.13 # Operator version 1.1.15 +elasticsearch_version: 1.1.2071 # Operator version 1.1.2071 +couchdb_version: 1.0.13 # Operator version 2.2.1 + + +# Maximo Application Suite +# ----------------------------------------------------------------------------- +mas_core_version: + 8.10.x: 8.10.14 # Updated + 8.11.x: 8.11.11 # Updated + 8.9.x: 8.9.10 # No Update +mas_assist_version: + 8.10.x: 8.7.4 # No Update + 8.11.x: 8.8.3 # No Update + 8.9.x: 8.6.5 # No Update +mas_hputilities_version: + 8.10.x: 8.6.5 # No Update + 8.11.x: "" # Not Supported + 8.9.x: 8.5.3 # No Update +mas_iot_version: + 8.10.x: 8.7.13 # Updated + 8.11.x: 8.8.9 # Updated + 8.9.x: 8.6.9 # No Update +mas_manage_version: + 8.10.x: 8.6.14 # Updated + 8.11.x: 8.7.8 # Updated + 8.9.x: 8.5.9 # No Update +mas_monitor_version: + 8.10.x: 8.10.10 # Updated + 8.11.x: 8.11.7 # Updated + 8.9.x: 8.9.6 # No Update +mas_optimizer_version: + 8.10.x: 8.4.6 # Updated + 8.11.x: 8.5.5 # Updated + 8.9.x: 8.3.3 # No Update +mas_predict_version: + 8.10.x: 8.8.2 # No Update + 8.11.x: 8.9.2 # No Update + 8.9.x: 8.7.2 # No Update +mas_visualinspection_version: + 8.10.x: 8.8.4 # Updated + 8.11.x: 8.9.3 # Updated + 8.9.x: 8.7.1 # No Update + +# Extra Images for UDS +# ------------------------------------------------------------------------------ +uds_extras_version: 1.5.0 + +# Extra Images for Mongo +# ------------------------------------------------------------------------------ +mongo_extras_version_default: 5.0.23 +mongo_extras_version: "{{ lookup('env', 'MONGODB_VERSION') | default(mongo_extras_version_default, True) }}" + +# Variables used to mirror additional mongo image versions +mongo_extras_version_4: 4.4.21 +mongo_extras_version_5: 5.0.23 +mongo_extras_version_6: 6.0.12 + +# Extra Images for Db2u +# ------------------------------------------------------------------------------ +db2u_extras_version: 1.0.5 + +# Extra Images for IBM Watson Discovery +# ------------------------------------------------------------------------------ +wd_extras_version: 1.0.4 + +# Extra Images for Amlen +# ------------------------------------------------------------------------------ +amlen_extras_version: 1.1.1 + +# Default Cloud Pak for Data version +# ------------------------------------------------------------------------------ +cpd_product_version_default: 4.6.6 +cpd_product_version: "{{ lookup('env', 'CPD_PRODUCT_VERSION') | default(cpd_product_version_default, true) }}" diff --git a/ibm/mas_devops/roles/mirror_extras_prepare/vars/amlen_1.1.1.yml b/ibm/mas_devops/roles/mirror_extras_prepare/vars/amlen_1.1.1.yml new file mode 100644 index 0000000000..ab27e6c093 --- /dev/null +++ b/ibm/mas_devops/roles/mirror_extras_prepare/vars/amlen_1.1.1.yml @@ -0,0 +1,17 @@ +--- +extra_images: + - name: amlen/operator-bundle + registry: quay.io + digest: sha256:7436ce312e7153c646e4d3686648a942192f01ba9b83dfcbd6a483e5786a662a + tag: 1.1.1 + + - name: amlen/operator + registry: quay.io + digest: sha256:f757eeb014800a5d490ce2918bf3d3c218bacadfcb28f7601938b8bff4c86090 + tag: 1.1.1 + + - name: kubebuilder/kube-rbac-proxy + registry: gcr.io + digest: sha256:0df4ae70e3bd0feffcec8f5cdb428f4abe666b667af991269ec5cb0bbda65869 + tag: 1.1.1 +