Pull request project-chip#1531: Ensure variables are local by using d…

…ef so they can't be accesed by multiple threads. Merge in WMN_TOOLS/matter from fix_variable_context_issue to silabs Squashed commit of the following: commit b0514b1b43fe31ca85b09aca99d9662d7dcfa50a Author: Junior Martinez <[email protected]> Date: Thu Feb 1 14:32:07 2024 -0500 ensure variables or local by using def so they can't be accesed by multiple threads.
rosahay-silabs · Apr 25, 2024 · a9e1c06 · a9e1c06
1 parent d7594db
commit a9e1c06
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/silabs_ci_scripts/pipeline/soc.groovy b/silabs_ci_scripts/pipeline/soc.groovy
@@ -52,24 +52,24 @@ def genericSoCMatterBuild(app, supportedBoards, ota_automation=false, ecosystem_
                                                             return
                                                         }
 
-                                                        rcpString = ""
+                                                        def rcpString = ""
                                                         if (family.isWiFi  || brcp != "") {
                                                             transportType = "WiFi"
                                                         } else {
                                                             transportType = "OpenThread"
                                                         }
 
-                                                        folderPath = transportType
+                                                        def folderPath = transportType
                                                         if (brcp != "") {
                                                             rcpString = "--wifi " + brcp
                                                             folderPath += "/${brcp}"
                                                         }
 
-                                                        sh "echo Building ${transportType} ${board.name} type ${option.name}"
-
-                                                        sh """./scripts/examples/gn_silabs_example.sh ${app.path} ./out/${app.name}/${folderPath}/${option.name} ${board.name} ${appBuildArg.option} ${rcpString} ${option.compilationFlags}
-                                                                mkdir -p ${saved_workspace}/out/${app.automation}/${option.name}/${board.name}/${folderPath}
-                                                                find out/${app.name}/${folderPath}/${option.name}/${board.name} \\( -name '*.map' -o -name '*.s37' -o -name '*.rps' \\) -exec cp {} ${saved_workspace}/out/${app.automation}/${option.name}/${board.name}/${folderPath}/ \\;
+                                                        sh """
+                                                            echo Building ${transportType} ${board.name} ${brcp} type ${option.name}
+                                                            ./scripts/examples/gn_silabs_example.sh ${app.path} ./out/${app.name}/${folderPath}/${option.name} ${board.name} ${appBuildArg.option} ${rcpString} ${option.compilationFlags}
+                                                            mkdir -p ${saved_workspace}/out/${app.automation}/${option.name}/${board.name}/${folderPath}
+                                                            find out/${app.name}/${folderPath}/${option.name}/${board.name} \\( -name '*.map' -o -name '*.s37' -o -name '*.rps' \\) -exec cp {} ${saved_workspace}/out/${app.automation}/${option.name}/${board.name}/${folderPath}/ \\;
                                                         """
 
                                                         stash name: transportType + 'Examples-'+app.name+'-'+board.name, includes: 'out/**/*.s37,/out/**/*.rps '