From 308d10254534d7af939c0a9961821371e0404823 Mon Sep 17 00:00:00 2001
From: Hussein Elsherbini <Hussein.Elsherbini@silabs.com>
Date: Thu, 21 Sep 2023 17:53:49 +0000
Subject: [PATCH] Pull request #1166: MATTER-2443 modified OTA binaries output
 path to be consistent with silabs_slc branch

Merge in WMN_TOOLS/matter from fix_ota_output_structure_smg to silabs

Squashed commit of the following:

commit 87ed9e9864e1e0387216f4ee81854881adc275c7
Author: hussein elsherbini <hussein.elsherbini@silabs.com>
Date:   Thu Sep 21 12:14:17 2023 -0400

    fixed name of var

commit 86e2db960337dbbe20d7b225ac60b60c7271e862
Author: hussein elsherbini <hussein.elsherbini@silabs.com>
Date:   Thu Sep 21 10:42:02 2023 -0400

    modified input to find command

commit e13576242f464dc028d3557c1148cd40f60f9237
Author: hussein elsherbini <hussein.elsherbini@silabs.com>
Date:   Wed Sep 20 16:31:57 2023 -0400

    MATTER-2443 modified OTA binaries output path to be consistent with silabs_slc branch
---
 Jenkinsfile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6598aa9c917c33..064b792936036b 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -191,8 +191,8 @@ def buildOpenThreadExample(app, ota_automation=false, ecosystem_automation=false
                                 if(ota_automation){
                                     // Move binaries to standardized output
                                     sh """ ./scripts/examples/gn_silabs_example.sh ./examples/${app}/silabs ./out/OTA/ota_automation_out/${app}/OpenThread/ ${board} ${config_args} chip_build_libshell=true
-                                            mkdir -p ${saved_workspace}/out/OTA/ota_automation_out/${app}/OpenThread/${board}
-                                            cp ./out/OTA/ota_automation_out/${app}/OpenThread/${board}/*.s37 ${saved_workspace}/out/OTA/ota_automation_out/${app}/OpenThread/${board}/"""
+                                            mkdir -p ${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/OpenThread
+                                            cp ./out/OTA/ota_automation_out/${app}/OpenThread/${board}/*.s37 ${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/OpenThread/"""
                                 }
                                 else if(ecosystem_automation){
                                     // Move binaries to standardized output
@@ -468,8 +468,8 @@ def moveWifiBinaries(app, board, radioName, ota_automation, sleepyBoard)
     if (ota_automation){
 
         sh """
-            ls; pwd; mkdir -p ${saved_workspace}/out/OTA/ota_automation_out/WiFi/${app}_wifi_${radioName}/${board}
-            cp out/OTA/ota_automation_out/WiFi/${app}_wifi_${radioName}/${board}/*.s37  ${saved_workspace}/out/OTA/ota_automation_out/WiFi/${app}_wifi_${radioName}/${board}/${platformAndRadio}-${appNameOnly}-example.s37"""
+            ls; pwd; mkdir -p ${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/WiFi
+            cp out/OTA/ota_automation_out/WiFi/${app}_wifi_${radioName}/${board}/*.s37  ${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/WiFi/${platformAndRadio}-${appNameOnly}-example.s37"""
     }
     else{
         fileTypesToMove.each { fileType ->
@@ -1298,11 +1298,11 @@ def generateGblFileAndOTAfiles()
                         pwd
 
                         if [ "${tech}" = "OpenThread" ] ; then
-                            bin_path="${dirPath}/${saved_workspace}/out/OTA/ota_automation_out/${app}/OpenThread/${board}"
+                            bin_path="${dirPath}/${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/OpenThread/"
                             file="\$(find \$bin_path/ -name \\*.s37 | grep -o '[^/]*\$')"
                         else
-                            bin_path="${dirPath}/${saved_workspace}/out/OTA/ota_automation_out/WiFi/${app}_wifi_${radioName}/${board}"
-                            file="\$(find \$bin_path/ -name \\*.s37 | grep -o '[^/]*\$')"
+                            bin_path="${dirPath}/${saved_workspace}/out/OTA/ota_automation_out/${app}/${board}/WiFi/"
+                            file="\$(find \$bin_path/ -name efr32-${radioName}-lighting-example.s37 | grep -o '[^/]*\$')"
                         fi
 
                         gbl_file="\$(basename \$file .s37).gbl"