Skip to content

Commit

Permalink
Pull request project-chip#85: Remove openthread ci scripts
Browse files Browse the repository at this point in the history
Merge in WMN_TOOLS/matter from remove_openthread_ci_scripts to silabs

Squashed commit of the following:

commit 17a94f1e8eb2560a10d7eee409582596b48d72a6
Author: jepenven-silabs <jean-francois.penven@silabs.com>
Date:   Thu Sep 8 14:31:47 2022 -0400

    fix typo

commit 9a44fa8cba80bada7c35673427032b6ebea18f8d
Author: jepenven-silabs <jean-francois.penven@silabs.com>
Date:   Thu Sep 8 12:00:47 2022 -0400

    Fix stash

commit 0362349ec838c52b43a5d26fe208018bf750535b
Author: Yulina Shu <Yulina.Shu@silabs.com>
Date:   Wed Sep 7 23:47:57 2022 +0000

    use build-farm-large for big job

commit c5660b1a3d78f1e71b8d517682ee4137ed5e9221
Author: jepenven-silabs <jean-francois.penven@silabs.com>
Date:   Thu Sep 8 08:33:15 2022 -0400

    Remove OpenThread python scripts build
  • Loading branch information
jepenven-silabs authored and jmartinez-silabs committed Aug 22, 2023
1 parent d401612 commit e1ed784
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 59 deletions.
29 changes: 18 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ buildOverlayDir = ''
RELEASE_NAME='22Q4-GA'
stashFolder = ''
chiptoolPath = ''

buildFarmLabel = 'Build-Farm'
buildFarmLargeLabel = 'Build-Farm-Large'

secrets = [[path: 'teams/gecko-sdk/app/svc_gsdk', engineVersion: 2,
secretValues: [[envVar: 'SL_PASSWORD', vaultKey: 'password'],
Expand Down Expand Up @@ -70,8 +71,6 @@ def initWorkspaceAndScm()

}

buildFarmLabel = 'Build-Farm'

def runInWorkspace(Map args, Closure cl)
{
return {
Expand Down Expand Up @@ -137,26 +136,34 @@ def bootstrapWorkspace()
}
}

def buildOpenThreadExample(String name, String board)
def buildOpenThreadExample(String app, String board)
{
actionWithRetry {
node(buildFarmLabel)
node(buildFarmLargeLabel)
{
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
buildOverlayDir)
def dirPath = workspaceTmpDir + createWorkspaceOverlay.overlayMatterPath
def saveDir = 'matter/'
def buildRelease = true
def releaseString = "\"chip_detail_logging=false chip_automation_logging=false chip_progress_logging=false is_debug=false show_qr_code=false chip_build_libshell=false enable_openthread_cli=false chip_openthread_ftd=true\""

dir(dirPath) {
withDockerContainer(image: "connectedhomeip/chip-build-efr32:0.5.64", args: "-u root")
{
// CSA Examples build
withEnv(['PW_ENVIRONMENT_ROOT='+dirPath])
{
sh "python3 ./silabs_ci_scripts/build_openthread_csa_examples.py \"${name}\" \"${board}\""

sh "./scripts/examples/gn_efr32_example.sh ./examples/${app}/efr32 ./out/CSA/${app}/OpenThread/standard ${board}"

if(buildRelease) {
sh "./scripts/examples/gn_efr32_example.sh ./examples/${app}/efr32 ./out/CSA/${app}/OpenThread/release ${board} ${releaseString}"
}
}
}

stash name: 'OpenThreadExamples-'+"${name}"+"-"+"${board}", includes: 'out/CSA/*/OpenThread/release/**/*.map ,'+
stash name: 'OpenThreadExamples-'+"${app}"+"-"+"${board}", includes: 'out/CSA/*/OpenThread/release/**/*.map ,'+
'out/CSA/*/OpenThread/standard/**/*.s37 ,' +
'out/CSA/*/OpenThread/release/**/*.s37 '

Expand All @@ -174,7 +181,7 @@ def buildOpenThreadExample(String name, String board)
def buildSilabsCustomOpenThreadExamples(String board)
{
actionWithRetry {
node(buildFarmLabel)
node(buildFarmLargeLabel)
{
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
buildOverlayDir)
Expand Down Expand Up @@ -208,7 +215,7 @@ def buildSilabsCustomOpenThreadExamples(String board)
def buildWiFiLighting()
{
actionWithRetry {
node(buildFarmLabel)
node(buildFarmLargeLabel)
{
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
buildOverlayDir)
Expand Down Expand Up @@ -254,7 +261,7 @@ def buildWiFiLighting()
def buildWiFiLock()
{
actionWithRetry {
node(buildFarmLabel)
node(buildFarmLargeLabel)
{
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
buildOverlayDir)
Expand Down Expand Up @@ -301,7 +308,7 @@ def buildWiFiLock()
def buildWiFiExamples()
{
actionWithRetry {
node(buildFarmLabel)
node(buildFarmLargeLabel)
{
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
buildOverlayDir)
Expand Down
48 changes: 0 additions & 48 deletions silabs_ci_scripts/build_openthread_csa_examples.py

This file was deleted.

0 comments on commit e1ed784

Please sign in to comment.