diff --git a/Jenkinsfile b/Jenkinsfile index a60a36fb24a5d9..ab3e86c649fe76 100755 --- 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 deleted file mode 100644 index ae4f99cf521b57..00000000000000 --- a/silabs_ci_scripts/build_custom_examples.py +++ /dev/null @@ -1,29 +0,0 @@ -####Imports -import subprocess -import sys -import json -import os -import glob -from pathlib import Path - -if (len(sys.argv) > 1): - BOARDS = {sys.argv[1]} -else: - BOARDS = {"BRD4161A", "BRD4186A"} - -print(BOARDS) - -#Defines - -BUILDS = {"OpenThread"} -BUILD_TYPES = {("standard", "")} -building_command = './scripts/examples/gn_efr32_example.sh ./silabs_examples/{app}/efr32 ./out/custom/{app}/{network} {board} {buildArguments}' - -for examples in glob.glob("./silabs_examples/*/efr32"): - for build in BUILDS: - for board in BOARDS: - for build_type in BUILD_TYPES: - parsed_path = examples.split('/') - #Build all custom examples - c = building_command.format(app=parsed_path[2], network=build + "/" + build_type[0], board=board, buildArguments=build_type[1]) - val = subprocess.check_call(c, shell=True)