[patch] Fix catalogCp4d issue for s390x arch (#1444)

ibm-mas · Jan 23, 2025 · cb99fb9 · cb99fb9
1 parent 3d3aaee
commit cb99fb9
Showing 1 changed file with 38 additions and 21 deletions.
diff --git a/python/src/mas/cli/install/app.py b/python/src/mas/cli/install/app.py
@@ -164,23 +164,29 @@ def formatRelease(self, release: str) -> str:
     @logMethodCall
     def processCatalogChoice(self) -> list:
         self.catalogDigest = self.chosenCatalog["catalog_digest"]
-        self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
         self.catalogMongoDbVersion = self.chosenCatalog["mongo_extras_version_default"]
+        if self.architecture != "s390x":
+            self.catalogCp4dVersion = self.chosenCatalog["cpd_product_version_default"]
+
+            applications = {
+                "Core": "mas_core_version",
+                "Manage": "mas_manage_version",
+                "IoT": "mas_iot_version",
+                "Monitor": "mas_monitor_version",
+                "Assist": "mas_assist_version",
+                "Optimizer": "mas_optimizer_version",
+                "Predict": "mas_predict_version",
+                "Inspection": "mas_visualinspection_version",
+            }
+        else:
+            applications = {
+                "Core": "mas_core_version",
+                "Manage": "mas_manage_version",
+            }
 
         self.catalogReleases = []
         self.catalogTable = []
 
-        applications = {
-            "Core": "mas_core_version",
-            "Manage": "mas_manage_version",
-            "IoT": "mas_iot_version",
-            "Monitor": "mas_monitor_version",
-            "Assist": "mas_assist_version",
-            "Optimizer": "mas_optimizer_version",
-            "Predict": "mas_predict_version",
-            "Inspection": "mas_visualinspection_version",
-        }
-
         # Dynamically fetch the channels from the chosen catalog
         # based on mas core
         for channel in self.chosenCatalog["mas_core_version"]:
@@ -190,15 +196,26 @@ def processCatalogChoice(self) -> list:
         for application, key in applications.items():
             self.catalogTable.append({"": application} | self.chosenCatalog[key])
 
-        summary = [
-            "",
-            "<u>Catalog Details</u>",
-            f"Catalog Image:         icr.io/cpopen/ibm-maximo-operator-catalog:{self.getParam('mas_catalog_version')}",
-            f"Catalog Digest:        {self.catalogDigest}",
-            f"MAS Releases:          {', '.join(self.catalogReleases)}",
-            f"Cloud Pak for Data:    {self.catalogCp4dVersion}",
-            f"MongoDb:               {self.catalogMongoDbVersion}",
-        ]
+        if self.architecture == "s390x":
+            summary = [
+                "",
+                "<u>Catalog Details</u>",
+                f"Catalog Image:         icr.io/cpopen/ibm-maximo-operator-catalog:{self.getParam('mas_catalog_version')}",
+                f"Catalog Digest:        {self.catalogDigest}",
+                f"MAS Releases:          {', '.join(self.catalogReleases)}",
+                f"MongoDb:               {self.catalogMongoDbVersion}",
+            ]
+        else:
+            summary = [
+                "",
+                "<u>Catalog Details</u>",
+                f"Catalog Image:         icr.io/cpopen/ibm-maximo-operator-catalog:{self.getParam('mas_catalog_version')}",
+                f"Catalog Digest:        {self.catalogDigest}",
+                f"MAS Releases:          {', '.join(self.catalogReleases)}",
+                f"Cloud Pak for Data:    {self.catalogCp4dVersion}",
+                f"MongoDb:               {self.catalogMongoDbVersion}",
+            ]
+
         return summary
 
     @logMethodCall