Skip to content
This repository has been archived by the owner on Nov 13, 2022. It is now read-only.

Commit

Permalink
[minor] Add support for Oct 2022 catalog (#80)
Browse files Browse the repository at this point in the history
Co-authored-by: Rick Acree <acree@us.ibm.com>
Co-authored-by: Caroline Azadze <caroazadze@ibm.com>
  • Loading branch information
3 people authored Nov 4, 2022
1 parent 06365f0 commit ea16123
Show file tree
Hide file tree
Showing 29 changed files with 371 additions and 32 deletions.
43 changes: 24 additions & 19 deletions build/bin/download-digestmaps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,53 +23,58 @@ function download_case() {

# SLS
# -----------------------------------------------------------------------------
download_case ibm-sls 3.4.0 ibmSlsSetup
download_case ibm-sls 3.4.1 ibmSlsSetup
#download_case ibm-sls 3.4.0 ibmSlsSetup
#download_case ibm-sls 3.4.1 ibmSlsSetup
download_case ibm-sls 3.5.0 ibmSlsSetup

# Truststore Manager
# -----------------------------------------------------------------------------
download_case ibm-truststore-mgr 1.3.0 ibmTrustStoreMgrSetup
#download_case ibm-truststore-mgr 1.3.0 ibmTrustStoreMgrSetup

# MAS Core
# -----------------------------------------------------------------------------
download_case ibm-mas 8.8.0 ibmMasSetup
download_case ibm-mas 8.8.1 ibmMasSetup
#download_case ibm-mas 8.8.0 ibmMasSetup
#download_case ibm-mas 8.8.1 ibmMasSetup
download_case ibm-mas 8.8.2 ibmMasSetup

# MAS Assist
# -----------------------------------------------------------------------------
download_case ibm-mas-assist 8.4.0 ibmMasAssistSetup
download_case ibm-mas-assist 8.5.0 ibmMasAssistSetup
download_case ibm-mas-assist 8.5.1 ibmMasAssistSetup

# MAS HP Utilities
# -----------------------------------------------------------------------------
download_case ibm-mas-hputilities 8.4.0 ibmMasHPUtilitiesSetup
#download_case ibm-mas-hputilities 8.4.0 ibmMasHPUtilitiesSetup

# MAS IoT
# -----------------------------------------------------------------------------
download_case ibm-mas-iot 8.5.0 ibmMasIotSetup
download_case ibm-mas-iot 8.5.1 ibmMasIotSetup
#download_case ibm-mas-iot 8.5.0 ibmMasIotSetup
#download_case ibm-mas-iot 8.5.1 ibmMasIotSetup
download_case ibm-mas-iot 8.5.2 ibmMasIotSetup

# MAS Manage
# -----------------------------------------------------------------------------
download_case ibm-mas-manage 8.4.0 ibmMasManageSetup
download_case ibm-mas-manage 8.4.1 ibmMasManageSetup
#download_case ibm-mas-manage 8.4.0 ibmMasManageSetup
#download_case ibm-mas-manage 8.4.1 ibmMasManageSetup
download_case ibm-mas-manage 8.4.2 ibmMasManageSetup

# MAS Monitor
# -----------------------------------------------------------------------------
download_case ibm-mas-monitor 8.8.0 ibmMasMonitorSetup
download_case ibm-mas-monitor 8.8.1 ibmMasMonitorSetup
#download_case ibm-mas-monitor 8.8.0 ibmMasMonitorSetup
#download_case ibm-mas-monitor 8.8.1 ibmMasMonitorSetup

# MAS Predict
# -----------------------------------------------------------------------------
download_case ibm-mas-predict 8.6.0 ibmMasPredictSetup
download_case ibm-mas-predict 8.6.1 ibmMasPredictSetup
#download_case ibm-mas-predict 8.6.0 ibmMasPredictSetup
#download_case ibm-mas-predict 8.6.1 ibmMasPredictSetup

# MAS Optimizer
# -----------------------------------------------------------------------------
download_case ibm-mas-optimizer 8.2.0 ibmMasOptimizerSetup
download_case ibm-mas-optimizer 8.2.1 ibmMasOptimizerSetup
#download_case ibm-mas-optimizer 8.2.0 ibmMasOptimizerSetup
#download_case ibm-mas-optimizer 8.2.1 ibmMasOptimizerSetup


# MAS Visual Inspection
# -----------------------------------------------------------------------------
download_case ibm-mas-visualinspection 8.6.0 ibmMasVisualInspectionSetup
download_case ibm-mas-visualinspection 8.6.1 ibmMasVisualInspectionSetup
#download_case ibm-mas-visualinspection 8.6.0 ibmMasVisualInspectionSetup
#download_case ibm-mas-visualinspection 8.6.1 ibmMasVisualInspectionSetup
1 change: 1 addition & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## Changes

- `2.6` Add support for Oct 2022 catalog ([#80](https://github.com/ibm-mas/ansible-airgap/pull/80))
- `2.5` Support IBM Pak and Two Phase Mirroring ([#79](https://github.com/ibm-mas/ansible-airgap/pull/79))
- `2.4` Add support for Sep 2022 catalog ([#76](https://github.com/ibm-mas/ansible-airgap/pull/76))
- `2.3` Add image mirroring support for remaining applications ([#72](https://github.com/ibm-mas/ansible-airgap/pull/72))
Expand Down
1 change: 1 addition & 0 deletions ibm/mas_airgap/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

## Change Log

- `2.6` Add support for Oct 2022 catalog ([#80](https://github.com/ibm-mas/ansible-airgap/pull/80))
- `2.5` Support IBM Pak and Two Phase Mirroring ([#79](https://github.com/ibm-mas/ansible-airgap/pull/79))
- `2.4` Add support for Sep 2022 catalog ([#76](https://github.com/ibm-mas/ansible-airgap/pull/76))
- `2.3` Add image mirroring support for remaining applications ([#72](https://github.com/ibm-mas/ansible-airgap/pull/72))
Expand Down
4 changes: 4 additions & 0 deletions ibm/mas_airgap/common_vars/casebundles/v8-220717-amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ uds_extras_version: 1.0.0
# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.2.6

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.0
4 changes: 4 additions & 0 deletions ibm/mas_airgap/common_vars/casebundles/v8-220717.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ uds_extras_version: 1.0.0
# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.2.6

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.0
4 changes: 4 additions & 0 deletions ibm/mas_airgap/common_vars/casebundles/v8-220805-amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,7 @@ uds_extras_version: 1.0.0
# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.2.6

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.0
4 changes: 4 additions & 0 deletions ibm/mas_airgap/common_vars/casebundles/v8-220927-amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@ uds_extras_version: 1.1.0
# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.2.6

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.0
42 changes: 42 additions & 0 deletions ibm/mas_airgap/common_vars/casebundles/v8-221025-amd64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# Case bundle configuration for IBM Maximo Operator Catalog v20220927
# -----------------------------------------------------------------------------
# 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:993d5ca2f327494abf3dc7175968bc12165a341c6f1f95a0d50ecde6a5663c7f

# Dependencies
# -----------------------------------------------------------------------------
common_svcs_version: 1.15.4 # Operator version 3.19.4 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-cp-common-services)
common_svcs_version_1: 1.16.1 # Operator version 3.20.1
db2u_version: 4.0.11 # Operator version 1.1.13 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-db2uoperator)
events_version: 4.2.1 # Operator version 4.2.1 (https://github.com/IBM/cloud-pak/tree/master/repo/case/ibm-events-operator)
uds_version: 2.0.8 # Operator version 2.0.8
sls_version: 3.5.0 # Operator version 3.5.0
tsm_version: 1.3.0 # Operator version 1.3.0

# Maximo Application Suite
# -----------------------------------------------------------------------------
mas_core_version: 8.8.2 # Operator version 8.8.2 (Verified)
mas_assist_version: 8.5.1 # Operator version 8.5.1 (Untested, we haven't got CP4D mirroring working yet)
mas_hputilities_version: 8.4.0 # Operator version 8.4.0 (Untested, we haven't got CP4D mirroring working yet)
mas_iot_version: 8.5.2 # Operator version 8.5.2 (Verified)
mas_manage_version: 8.4.2 # Operator version 8.4.2 (Verified)
mas_monitor_version: 8.8.1 # Operator version 8.8.1 (Tested, doesn't work, fix for air gap support should be in 8.8.2 though)
mas_optimizer_version: 8.2.1 # Operator version 8.2.1 (Verified)
mas_predict_version: 8.6.1 # Operator version 8.6.1 (Untested, we haven't got CP4D mirroring working yet)
mas_visualinspection_version: 8.6.1 # Operator version 8.6.1 (Tested - doesn't work, digest problems and still requires SBO)

# Extra Images for UDS
# ------------------------------------------------------------------------------
uds_extras_version: 1.1.0

# Extra Images for Mongo
# ------------------------------------------------------------------------------
mongo_extras_version: 4.2.6

# Extra Images for Db2u
# ------------------------------------------------------------------------------
db2u_extras_version: 1.0.0
21 changes: 21 additions & 0 deletions ibm/mas_airgap/common_vars/digests/ibm-mas-assist/8.5.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cp.icr.io/cp/assist/assist-db-job:1.0.6: cp.icr.io/cp/assist/assist-db-job@sha256:978f35a33afd10ba67f61cdf189b4140ca5c49032d3f45ae9f4c009585207fed
cp.icr.io/cp/assist/assist-useragent:1.1.8: cp.icr.io/cp/assist/assist-useragent@sha256:72008b927a6ff4b8d5c22535418dac49993c95b065ac84df4cfcbe06d5ea2ef4
cp.icr.io/cp/assist/assist-voice-gateway:1.0.1: cp.icr.io/cp/assist/assist-voice-gateway@sha256:54904133fe8b1ec911228ee68ae31edab46226119591ae2ec8c30515a110e117
cp.icr.io/cp/assist/assist-voice-management:1.0.1: cp.icr.io/cp/assist/assist-voice-management@sha256:a43f421f62d756f9348e557e7c4f833ae9c50fda9da45ac4bcdf9137b10c3d27
cp.icr.io/cp/assist/assist-voice-session-mxinspect:1.0.1: cp.icr.io/cp/assist/assist-voice-session-mxinspect@sha256:c6e00ddb888c516597f03cad38addce7dd3ce0e136a65276a7f55bf4813db96d
cp.icr.io/cp/assist/ema-admin-console:1.1.9: cp.icr.io/cp/assist/ema-admin-console@sha256:61b2bf915f90f409c12092a9c08fd6b4c45aa3153b16f44e073d5a25569796ad
cp.icr.io/cp/assist/ema-anti-virus:1.1.9: cp.icr.io/cp/assist/ema-anti-virus@sha256:50acb9bc9a9b7e29c206cbc1503a6d653dd48651580a757126c444b268903189
cp.icr.io/cp/assist/ema-api:1.1.12: cp.icr.io/cp/assist/ema-api@sha256:4708eafd19dad73aead08c35738eabac56f093bc3250e6f330ad441b99a25ba8
cp.icr.io/cp/assist/ema-common-util:1.1.8: cp.icr.io/cp/assist/ema-common-util@sha256:899a0c163c816ab931fe64f437f66deadac2edd0bb9794aad26a39c8c8742f91
cp.icr.io/cp/assist/ema-crawler:1.1.8: cp.icr.io/cp/assist/ema-crawler@sha256:d120734ca3dd52ec120800d719bda299b97b9e66debdd4b8e57d56e8cc6ccda9
cp.icr.io/cp/assist/ema-diagnosis-engine-bn:1.1.9: cp.icr.io/cp/assist/ema-diagnosis-engine-bn@sha256:c5e7c6917d2324b9541938e2b56286876751d6c3c08ea835ee71806bd9baad0c
cp.icr.io/cp/assist/ema-diagnosis-engine-dt:1.1.9: cp.icr.io/cp/assist/ema-diagnosis-engine-dt@sha256:4ee76650887e2113a4caee3abdf54fbd9ce8c1bcfc68e8b80781a0f5e8ec64d1
cp.icr.io/cp/assist/ema-diagnosis-engine:1.1.9: cp.icr.io/cp/assist/ema-diagnosis-engine@sha256:e62570b8b42dbc1f0cbf1b24ef4d784c3ea032cadcd2eb4655482b7f5db3e47b
cp.icr.io/cp/assist/ema-haproxy:1.1.8: cp.icr.io/cp/assist/ema-haproxy@sha256:3b9cfa942d01bbad306867ea20f312e3482de9fb103f0a1c1930e112591b09ca
cp.icr.io/cp/assist/ema-monitor:1.1.10: cp.icr.io/cp/assist/ema-monitor@sha256:9a4746c5e3dae1e0f8bd17597b684a532d73d2a532d6a2977c475c962b00293e
cp.icr.io/cp/assist/ema-multi-tenant:1.1.8: cp.icr.io/cp/assist/ema-multi-tenant@sha256:44a679f9e74c8679cf07882ebc3298babdc87e399f96532007cce7b163b64fd2
cp.icr.io/cp/assist/ema-pg-cronjob:1.1.9: cp.icr.io/cp/assist/ema-pg-cronjob@sha256:e3860f22703e3997d6d6136a1366002494081867813aaa9edc6b75e496151b45
cp.icr.io/cp/assist/ema-redis:1.1.8: cp.icr.io/cp/assist/ema-redis@sha256:872b50bfadf3f19046c5a4611ce63fcb68d34ad9b071c0213539d1d42042b88f
cp.icr.io/cp/assist/ema-studio:1.1.10: cp.icr.io/cp/assist/ema-studio@sha256:3c9af32368e207f4fd5428b8b736556558a2c1129f2f71b04305b7ec517a1d1e
cp.icr.io/cp/assist/ema-technician:1.1.13: cp.icr.io/cp/assist/ema-technician@sha256:cd2fdd49f6da88aee21e6d763d955475d6de89b05f6a9f570dc164e0fc9a50c9
cp.icr.io/cp/assist/ibm-mas-assist-ws:8.5.0: cp.icr.io/cp/assist/ibm-mas-assist-ws@sha256:e95d492ffc9025fb60ae1378f08e875d3e82042cbe65128a3ba10a479c42abdb
21 changes: 21 additions & 0 deletions ibm/mas_airgap/common_vars/digests/ibm-mas-assist/8.5.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cp.icr.io/cp/assist/assist-db-job:1.0.7: cp.icr.io/cp/assist/assist-db-job@sha256:3c198cb245310b7f9c9518006b39ed41581630bfae9baaaecb7403f39f1fee37
cp.icr.io/cp/assist/assist-useragent:1.1.9: cp.icr.io/cp/assist/assist-useragent@sha256:27d09b5b0c3e2de8f309df27f0469ca5f3e4bb7d314a663f41d34b1935e3e4a5
cp.icr.io/cp/assist/assist-voice-gateway:1.0.2: cp.icr.io/cp/assist/assist-voice-gateway@sha256:7f32c42434c5e2ffc60babb3eb5b839c2fbfad265793e4da333a7494a3d4f631
cp.icr.io/cp/assist/assist-voice-management:1.0.2: cp.icr.io/cp/assist/assist-voice-management@sha256:a4ab52403bd146fa6ead447f9ceb256581cfc9adeca386d1c9d0c2286cf31b50
cp.icr.io/cp/assist/assist-voice-session-mxinspect:1.0.2: cp.icr.io/cp/assist/assist-voice-session-mxinspect@sha256:e0d4289c0c317d2d2def64774ef03e862debc4b5719985916c3070b422157f0c
cp.icr.io/cp/assist/ema-admin-console:1.1.10: cp.icr.io/cp/assist/ema-admin-console@sha256:a65d1edf1f96bccef887fc438c931f7a6ce28be956fc61e8008cfb1046587815
cp.icr.io/cp/assist/ema-anti-virus:1.1.10: cp.icr.io/cp/assist/ema-anti-virus@sha256:b72bc3146f9efbac9eb5c084bba50b406b37618582f3ef81e7d546bdd652a161
cp.icr.io/cp/assist/ema-api:1.1.13: cp.icr.io/cp/assist/ema-api@sha256:b8f66365d411060d8500ea0b2678ff2eba88589e0b1b5cbb6f10275aa1adbf9b
cp.icr.io/cp/assist/ema-common-util:1.1.9: cp.icr.io/cp/assist/ema-common-util@sha256:493d4a07a64396c29454456516d8e8e4351a3be20d154d37f7bb391a38544d09
cp.icr.io/cp/assist/ema-crawler:1.1.9: cp.icr.io/cp/assist/ema-crawler@sha256:ac2cd135dc3b23d1d543789905879816cb67fb740c31d8083eceaed460496ca3
cp.icr.io/cp/assist/ema-diagnosis-engine-bn:1.1.10: cp.icr.io/cp/assist/ema-diagnosis-engine-bn@sha256:c38fcdbfb9b86f7d437d20883aa694312caa4fd37f2c338afcd37022c268680b
cp.icr.io/cp/assist/ema-diagnosis-engine-dt:1.1.10: cp.icr.io/cp/assist/ema-diagnosis-engine-dt@sha256:74c9ed71d9b45eb65cc1b87ed140d11e778ec245d7862e844f86ec663027a4f0
cp.icr.io/cp/assist/ema-diagnosis-engine:1.1.10: cp.icr.io/cp/assist/ema-diagnosis-engine@sha256:3f835d783513a59d52e63901f94ea9e9ab322f5a05b26a3eed69c06a5ed0e88a
cp.icr.io/cp/assist/ema-haproxy:1.1.9: cp.icr.io/cp/assist/ema-haproxy@sha256:b2037ccbccd6a25bf5d3c14fae7f0178deaa60ca748cc98e1026988a35f5a88e
cp.icr.io/cp/assist/ema-monitor:1.1.11: cp.icr.io/cp/assist/ema-monitor@sha256:0b0f66373bda6559dfa0535c9e780c4c603205f004fdb06b33654226ae392a6b
cp.icr.io/cp/assist/ema-multi-tenant:1.1.9: cp.icr.io/cp/assist/ema-multi-tenant@sha256:cdeab7d2a07e1f64b296093a15e449a946443c0e80074ba56e6ee50d848c6fb0
cp.icr.io/cp/assist/ema-pg-cronjob:1.1.10: cp.icr.io/cp/assist/ema-pg-cronjob@sha256:fc8b6550973aa713e20c1fd2ef82dbc89beb7e2193120e8c367611e5281ad716
cp.icr.io/cp/assist/ema-redis:1.1.9: cp.icr.io/cp/assist/ema-redis@sha256:1d96f0893ee87dfb836a8b1b1d03b3ff45cd2b58c272a2e4c011b00289eb9fe8
cp.icr.io/cp/assist/ema-studio:1.1.11: cp.icr.io/cp/assist/ema-studio@sha256:e0302d60de2da5da13ddb162954d977b100ba9fa89aa705068e0752f61cc13e0
cp.icr.io/cp/assist/ema-technician:1.1.14: cp.icr.io/cp/assist/ema-technician@sha256:933e9e4437acc72b35d17d9f729fce2f4f457772ccb87d97b4e6a2aadc21f15b
cp.icr.io/cp/assist/ibm-mas-assist-ws:8.5.1: cp.icr.io/cp/assist/ibm-mas-assist-ws@sha256:781d2e9209146d32f7d0ebfe5685d92806ba73b6454a14722f8e6cf5fae0258a
Loading

0 comments on commit ea16123

Please sign in to comment.