Pull request #121: [Matter-614] Optimize CI for custom examples

Merge in WMN_TOOLS/matter from features/matter-614-remove_script_custom_examples to silabs Squashed commit of the following: commit 2212b06a2df1342d8b6b75e8e8d4b2d560e8b3cc Author: jepenven-silabs <[email protected]> Date: Tue Sep 20 08:27:19 2022 -0400 Optimize CI for custom examples
project-chip · May 1, 2023 · 0dbb966 · 0dbb966
1 parent 29e5ac9
commit 0dbb966
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -165,7 +165,7 @@ def buildOpenThreadExample(app, board)
 
 
 
-def buildSilabsCustomOpenThreadExamples(board)
+def buildSilabsCustomOpenThreadExamples(app, board)
 {
     actionWithRetry {
         node(buildFarmLargeLabel)
@@ -181,7 +181,7 @@ def buildSilabsCustomOpenThreadExamples(board)
                     withEnv(['PW_ENVIRONMENT_ROOT='+dirPath])
                     {
                         try {
-                            sh "python3 ./silabs_ci_scripts/build_custom_examples.py \"${board}\""
+                            sh "./scripts/examples/gn_efr32_example.sh ./silabs_examples/${app}/efr32 ./out/silabs/${app}/OpenThread/ ${board}"
                         } catch (e) {
                             deactivateWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
                                                        workspaceTmpDir,
@@ -848,16 +848,19 @@ def pipeline()
 
         def parallelNodes = [:]
         def boardsForCustom = [:]
+        def silabsExamples = ["onoff-plug-app", "sl-newLight", "template"]
 
-        if (env.BRANCH_NAME == "silabs") {
+        if (env.BRANCH_NAME.startsWith('RC_')) {
             boardsForCustom = ["BRD4161A", "BRD4186C", "BRD4187C", "BRD4166A"]
         } else {
              boardsForCustom = ["BRD4161A", "BRD4186C", "BRD4166A"]
         }
 
-        boardsForCustom.each { board ->
-             parallelNodes[board]      = { this.buildSilabsCustomOpenThreadExamples(board)   }
-         }
+        silabsExamples.each { example ->
+            boardsForCustom.each { board ->
+                parallelNodes[example + " " + board]      = { this.buildSilabsCustomOpenThreadExamples(example, board)   }
+            }
+        }
 
          parallelNodes.failFast = false
          parallel parallelNodes

diff --git a/silabs_ci_scripts/build_custom_examples.py b/silabs_ci_scripts/build_custom_examples.py