From 730220a34cc14d0f95c6dc2db23cc0bdef6a141a Mon Sep 17 00:00:00 2001 From: Unnati Date: Thu, 11 Apr 2024 16:37:37 +0530 Subject: [PATCH 1/3] [patch] Slack message modification --- image/cli/app-root/src/finalizer.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/image/cli/app-root/src/finalizer.py b/image/cli/app-root/src/finalizer.py index 50aa6ffb38..0c1568e572 100644 --- a/image/cli/app-root/src/finalizer.py +++ b/image/cli/app-root/src/finalizer.py @@ -298,6 +298,20 @@ def getcp4dCompsVersions(): } } + # Associate Mas FVT Focal group with respect to product + # ------------------------------------------------------------------------- + productFocal = { + "ibm-mas": "S04PPFYUJG5", + "ibm-mas-assist": "S04PSA1M1RR", + "ibm-mas-iot":"S04PBTG77JB", + "ibm-mas-manage":"S05QB03HNTU", + "ibm-mas-monitor":"S04QG3R30SC", + "ibm-mas-optimizer":"S04PSB1R8DR", + "ibm-mas-predict":"S04Q53TT5S5", + "ibm-mas-visualinspection":"S04PUSAL2A0" + } + + for productId in knownProductIds: apiVersion = knownProductIds[productId]["apiVersion"] kind = knownProductIds[productId]["kind"] @@ -548,7 +562,7 @@ def getcp4dCompsVersions(): for product in result["products"]: messageBlocks = [] messageBlocks.append(buildHeader(f"{product}")) - messageBlocks.append(buildSection(f"The following testsuites reported one or more failures or errors during **")) + messageBlocks.append(buildSection(f" The following testsuites reported one or more failures or errors during **")) if "results" in result["products"][product]: for suite in result["products"][product]["results"]: From 3dfcec0e5c067b33429c3104d303818c689cb8c2 Mon Sep 17 00:00:00 2001 From: Unnati Date: Fri, 12 Apr 2024 21:45:12 +0530 Subject: [PATCH 2/3] [patch] Message issue fix --- image/cli/app-root/src/finalizer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/image/cli/app-root/src/finalizer.py b/image/cli/app-root/src/finalizer.py index 0c1568e572..7b59545422 100644 --- a/image/cli/app-root/src/finalizer.py +++ b/image/cli/app-root/src/finalizer.py @@ -302,6 +302,7 @@ def getcp4dCompsVersions(): # ------------------------------------------------------------------------- productFocal = { "ibm-mas": "S04PPFYUJG5", + "ibm-mas-devops": "S04PPFYUJG5", "ibm-mas-assist": "S04PSA1M1RR", "ibm-mas-iot":"S04PBTG77JB", "ibm-mas-manage":"S05QB03HNTU", @@ -562,7 +563,10 @@ def getcp4dCompsVersions(): for product in result["products"]: messageBlocks = [] messageBlocks.append(buildHeader(f"{product}")) - messageBlocks.append(buildSection(f" The following testsuites reported one or more failures or errors during **")) + if(product in result["products"]): + messageBlocks.append(buildSection(f" The following testsuites reported one or more failures or errors during **")) + else: + messageBlocks.append(buildSection(f"The following testsuites reported one or more failures or errors during **")) if "results" in result["products"][product]: for suite in result["products"][product]["results"]: From 009605da59066d563a6a48c2ed71d050968b88b0 Mon Sep 17 00:00:00 2001 From: Unnati Date: Fri, 12 Apr 2024 21:54:10 +0530 Subject: [PATCH 3/3] [patch] Message condition --- image/cli/app-root/src/finalizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli/app-root/src/finalizer.py b/image/cli/app-root/src/finalizer.py index 3c8f6a1aa9..90695162fb 100644 --- a/image/cli/app-root/src/finalizer.py +++ b/image/cli/app-root/src/finalizer.py @@ -565,7 +565,7 @@ def getcp4dCompsVersions(): for product in result["products"]: messageBlocks = [] messageBlocks.append(buildHeader(f"{product}")) - if(product in result["products"]): + if(product in productFocal): messageBlocks.append(buildSection(f" The following testsuites reported one or more failures or errors during **")) else: messageBlocks.append(buildSection(f"The following testsuites reported one or more failures or errors during **"))