From 042cc2fee43dad11967e6e7bf234d24fd0a782dd Mon Sep 17 00:00:00 2001 From: Junior Martinez Date: Mon, 29 Aug 2022 21:06:59 +0000 Subject: [PATCH] Pull request #53: Fix reverted change for chip-tool build. Merge in WMN_TOOLS/matter from fix_examples_builds to silabs Squashed commit of the following: commit 1183ac32d72aa68f71907bb1e4b297507a7d3a85 Author: Junior Martinez Date: Mon Aug 29 11:42:33 2022 -0400 add new boards to the build flow commit 1fc2cced12204aa3b7a14c0defce469f3bc0ae9a Author: Junior Martinez Date: Mon Aug 29 10:00:40 2022 -0400 Fix reverted change for chip-tool build. Recursive checkout of efr32 submodules needed for thread --- Jenkinsfile | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 80bc5e541da1b3..ab1c897a767409 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ def initWorkspaceAndScm() // Matter Init --Checkout relevant submodule - sh 'scripts/checkout_submodules.py --shallow --platform efr32' + sh 'scripts/checkout_submodules.py --shallow --recursive --platform efr32' } dir(buildOverlayDir+'/matter-scripts'){ @@ -316,7 +316,7 @@ def buildChipTool() sh 'git config --global --add safe.directory $(pwd)' sh 'git config --global --add safe.directory $(pwd)/third_party/pigweed/repo' sh './scripts/build/gn_bootstrap.sh' - sh './scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target linux-arm64-chip-tool-ipv6only build"' + sh './scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target linux-arm64-clang-chip-tool-ipv6only build"' } } @@ -626,34 +626,42 @@ def pipeline() parallelNodes['Build OpenThread Lighting BRD4161A'] = { this.buildOpenThreadExample("lighting-app", "BRD4161A") } parallelNodes['Build OpenThread Lighting BRD4164A'] = { this.buildOpenThreadExample("lighting-app", "BRD4164A") } parallelNodes['Build OpenThread Lighting BRD4166A'] = { this.buildOpenThreadExample("lighting-app", "BRD4166A") } - parallelNodes['Build OpenThread Lighting BRD4186A'] = { this.buildOpenThreadExample("lighting-app", "BRD4186A") } - parallelNodes['Build OpenThread Lighting BRD4187A'] = { this.buildOpenThreadExample("lighting-app", "BRD4187A") } + parallelNodes['Build OpenThread Lighting BRD4186C'] = { this.buildOpenThreadExample("lighting-app", "BRD4186C") } + parallelNodes['Build OpenThread Lighting BRD4187C'] = { this.buildOpenThreadExample("lighting-app", "BRD4187C") } + parallelNodes['Build OpenThread Lighting BRD2601B'] = { this.buildOpenThreadExample("lighting-app", "BRD2601B") } + parallelNodes['Build OpenThread Lighting BRD2703A'] = { this.buildOpenThreadExample("lighting-app", "BRD2703A") } // Fix Me //parallelNodes['Build OpenThread Lighting BRD4304A'] = { this.buildOpenThreadExample("lighting-app", "BRD4304A") } parallelNodes['Build OpenThread Lock BRD4161A'] = { this.buildOpenThreadExample("lock-app", "BRD4161A") } parallelNodes['Build OpenThread Lock BRD4164A'] = { this.buildOpenThreadExample("lock-app", "BRD4164A") } parallelNodes['Build OpenThread Lock BRD4166A'] = { this.buildOpenThreadExample("lock-app", "BRD4166A") } - parallelNodes['Build OpenThread Lock BRD4186A'] = { this.buildOpenThreadExample("lock-app", "BRD4186A") } - parallelNodes['Build OpenThread Lock BRD4187A'] = { this.buildOpenThreadExample("lock-app", "BRD4187A") } + parallelNodes['Build OpenThread Lock BRD4186C'] = { this.buildOpenThreadExample("lock-app", "BRD4186C") } + parallelNodes['Build OpenThread Lock BRD4187C'] = { this.buildOpenThreadExample("lock-app", "BRD4187C") } + parallelNodes['Build OpenThread Lock BRD2601B'] = { this.buildOpenThreadExample("lock-app", "BRD2601B") } + parallelNodes['Build OpenThread Lock BRD2703A'] = { this.buildOpenThreadExample("lock-app", "BRD2703A") } // parallelNodes['Build OpenThread Lock BRD4304A'] = { this.buildOpenThreadExample("lock-app", "BRD4304A") } parallelNodes['Build OpenThread Light switch BRD4161A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4161A") } parallelNodes['Build OpenThread Light switch BRD4164A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4164A") } parallelNodes['Build OpenThread Light switch BRD4166A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4166A") } - parallelNodes['Build OpenThread Light switch BRD4186A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4186A") } - parallelNodes['Build OpenThread Light switch BRD4187A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4187A") } + parallelNodes['Build OpenThread Light switch BRD4186C'] = { this.buildOpenThreadExample("light-switch-app", "BRD4186C") } + parallelNodes['Build OpenThread Light switch BRD4187C'] = { this.buildOpenThreadExample("light-switch-app", "BRD4187C") } + parallelNodes['Build OpenThread Light switch BRD2601B'] = { this.buildOpenThreadExample("light-switch-app", "BRD2601B") } + parallelNodes['Build OpenThread Light switch BRD2703A'] = { this.buildOpenThreadExample("light-switch-app", "BRD2703A") } // parallelNodes['Build OpenThread Light switch BRD4304A'] = { this.buildOpenThreadExample("light-switch-app", "BRD4304A") } parallelNodes['Build OpenThread Window BRD4161A'] = { this.buildOpenThreadExample("window-app", "BRD4161A") } parallelNodes['Build OpenThread Window BRD4164A'] = { this.buildOpenThreadExample("window-app", "BRD4164A") } parallelNodes['Build OpenThread Window BRD4166A'] = { this.buildOpenThreadExample("window-app", "BRD4166A") } - parallelNodes['Build OpenThread Window BRD4186A'] = { this.buildOpenThreadExample("window-app", "BRD4186A") } - parallelNodes['Build OpenThread Window BRD4187A'] = { this.buildOpenThreadExample("window-app", "BRD4187A") } + parallelNodes['Build OpenThread Window BRD4186C'] = { this.buildOpenThreadExample("window-app", "BRD4186C") } + parallelNodes['Build OpenThread Window BRD4187C'] = { this.buildOpenThreadExample("window-app", "BRD4187C") } + parallelNodes['Build OpenThread Window BRD2601B'] = { this.buildOpenThreadExample("window-app", "BRD2601B") } + parallelNodes['Build OpenThread Window BRD2703A'] = { this.buildOpenThreadExample("window-app", "BRD2703A") } // parallelNodes['Build OpenThread Window BRD4304A'] = { this.buildOpenThreadExample("window-app", "BRD4304A") } parallelNodes['Build Custom Examples BRD4161A'] = { this.buildSilabsCustomOpenThreadExamples("BRD4161A") } - parallelNodes['Build Custom Examples BRD4186A'] = { this.buildSilabsCustomOpenThreadExamples("BRD4186A") } + parallelNodes['Build Custom Examples BRD4186C'] = { this.buildSilabsCustomOpenThreadExamples("BRD4186C") } } //