Skip to content

Commit d2f0278

Browse files
jmartinez-silabsjmartinez-silabs
committed
Pull request project-chip#1468: remove Generate RPS stage.
Merge in WMN_TOOLS/matter from remove_rps_creation_ci_step to silabs Squashed commit of the following: commit a5167f7ef98d6fa9b9c8813c1feeafb91f1c16d6 Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Mon Jan 8 13:55:45 2024 -0500 Base on discussion, 1 stash command including both s37 and rps file should work and is cleaner commit 2d35889116430c3588834286b3c488611a403378 Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Mon Jan 8 13:30:00 2024 -0500 Fix rps copy condition commit cd213485b39ad19a192e566d5e5a4ad21c6c4dcd Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Mon Jan 8 12:45:15 2024 -0500 remove Generate RPS stage. Store .rps file after build script for 917 soc. Remove the now unsupported wifi SOC boards from wifi test suites and iot reports
1 parent 941bec0 commit d2f0278

File tree

2 files changed

+17
-110
lines changed

2 files changed

+17
-110
lines changed

‎Jenkinsfile

+7-108
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ def exportIoTReports()
355355
// Matter Thread MG24 (BRD4187C) – Window Shade
356356
// Matter Wi-Fi 9116 (BRD4187C) – Lock
357357
// Matter Wi-Fi 9116 (BRD4187C) – Thermostat
358-
// Matter Wi-Fi 917 (BRD4325B) – Lock
359-
// Matter Wi-Fi 917 (BRD4325B) – Thermostat
358+
// Matter Wi-Fi 917 (BRD4338A) – Lock
359+
// Matter Wi-Fi 917 (BRD4338A) – Thermostat
360360

361361
def wifiSizeTrackingApp = [ "lock-app", "thermostat"]
362362
def openThreadMG24Apps = ["lighting-app", "lock-app", "window-app"]
@@ -405,16 +405,16 @@ def exportIoTReports()
405405
"""
406406
}
407407

408-
// Generate report for WiFi SOC (BRD4325B)s
408+
// Generate report for WiFi SOC (BRD4338A)s
409409
wifiSizeTrackingApp.each { app ->
410410
def appNameOnly = app - '-app'
411411
sh """unset OTEL_EXPORTER_OTLP_ENDPOINT
412412
code_size_analyzer_cli \
413-
--map_file ${saved_workspace}/out/release/BRD4325B/WiFi/SiWx917-${appNameOnly}-example.map \
413+
--map_file ${saved_workspace}/out/release/BRD4338A/WiFi/SiWx917-${appNameOnly}-example.map \
414414
--stack_name matter \
415-
--target_part SiWG917M612LGTAA \
415+
--target_part SiWG917M111MGTBA \
416416
--compiler gcc \
417-
--target_board BRD4325B \
417+
--target_board BRD4338A \
418418
--app_name ${app}-WiFi-917 \
419419
--service_url https://code-size-analyzer.silabs.net \
420420
--branch_name ${env.BRANCH_NAME} \
@@ -630,7 +630,7 @@ def utfThreadTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,boar
630630

631631
def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,wifi_module,testSuite,manifestYaml,testSequenceYaml)
632632
{
633-
def wifiSoCBoards = ["BRD4325B", "BRD4325C", "BRD4338A"]
633+
def wifiSoCBoards = ["BRD4338A"]
634634
globalLock(credentialsId: 'hwmux_token_matterci', deviceGroup: deviceGroup) {
635635
node(nomadNode)
636636
{
@@ -845,92 +845,6 @@ def generateGblFileAndOTAfiles()
845845
}
846846
}
847847

848-
def generateRpsFiles()
849-
{
850-
actionWithRetry {
851-
node(buildFarmLabel)
852-
{
853-
def boards = "BRD4325B,BRD4338A"
854-
if (completeBuild){
855-
boards = boards + ",BRD4325C"
856-
}
857-
def wifiPlatforms = "917_soc"
858-
def appName = "lighting,lock,light-switch,onoff-plug,window"
859-
def stashExample = "lighting-app"
860-
def workspaceTmpDir = createWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
861-
buildOverlayDir)
862-
def dirPath = workspaceTmpDir + createWorkspaceOverlay.overlayMatterPath
863-
def saveDir = 'matter/'
864-
865-
def commanderPath = dirPath + "/commander/commander"
866-
867-
// Closure to generate the rps files
868-
def genRpsFiles = {app, board, radioName ->
869-
870-
sh """
871-
ls ${workspaceTmpDir}
872-
pwd
873-
${commanderPath} --version
874-
875-
bin_path_std="${dirPath}/${saved_workspace}/out/standard/${board}/WiFi/"
876-
bin_path_release="${dirPath}/${saved_workspace}/out/release/${board}/WiFi/"
877-
file_std="\$(find \$bin_path_std/*${app}*.s37 | grep -o '[^/]*\$')"
878-
file_release="\$(find \$bin_path_release/*${app}*.s37 | grep -o '[^/]*\$')"
879-
880-
rps_file_std="\$(basename \$file_std .s37).rps"
881-
rps_file_release="\$(basename \$file_release .s37).rps"
882-
883-
${commanderPath} rps create \$bin_path_std/\$rps_file_std --app \$bin_path_std/\$file_std
884-
${commanderPath} rps create \$bin_path_release/\$rps_file_release --app \$bin_path_release/\$file_release
885-
886-
ls -al \$bin_path_std
887-
ls -al \$bin_path_release
888-
889-
"""
890-
return 0
891-
}
892-
893-
withDockerRegistry([url: "https://artifactory.silabs.net ", credentialsId: 'svc_gsdk']){
894-
sh "docker pull $gsdkImage"
895-
}
896-
897-
dir(dirPath) {
898-
try{
899-
withDockerContainer(image: gsdkImage)
900-
{
901-
withEnv(['file_std=""',
902-
'file_release=""',
903-
'rps_file_std=""',
904-
'rps_file_release=""',
905-
'bin_path_std=""',
906-
'bin_path_release=""']){
907-
boards.tokenize(",").each{ brd ->
908-
wifiPlatforms.tokenize(",").each{ platform ->
909-
appName.tokenize(",").each{ app ->
910-
// generating the RPS file for 917 SoC
911-
genRpsFiles.call(app, brd, platform)
912-
}
913-
}
914-
// stashing the lighting rps file which will be used later in the utf
915-
stash name : 'WiFiExamples-' + stashExample + '-' + brd + '-917_soc', includes: "saved_workspace/out/standard/" + "${brd}" + "/WiFi/*lighting*.rps"
916-
}
917-
}
918-
}
919-
}
920-
catch (e)
921-
{
922-
deactivateWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
923-
workspaceTmpDir,
924-
saveDir,
925-
'-name no-files')
926-
throw e
927-
}
928-
}
929-
deactivateWorkspaceOverlay(advanceStageMarker.getBuildStagesList(), workspaceTmpDir, 'matter/' + saved_workspace,'-name "*.rps"')
930-
}
931-
}
932-
}
933-
934848
def pushToArtifactoryAndUbai()
935849
{
936850
actionWithRetry {
@@ -1169,21 +1083,6 @@ def pipeline()
11691083
}
11701084
}
11711085

1172-
// This stage can fail should the SiW917 builds fail.
1173-
// Do not stop the pipeline if this is the case.
1174-
// SQA test can still run on OpenThread boards.
1175-
stage("Generate RPS files")
1176-
{
1177-
// Generating the RPS file for 917 SoC
1178-
advanceStageMarker()
1179-
try {
1180-
generateRpsFiles()
1181-
} catch (err) {
1182-
unstable(message: "Some build failures occured")
1183-
}
1184-
1185-
}
1186-
11871086
stage("Push to Artifactory and UBAI")
11881087
{
11891088
advanceStageMarker()

‎silabs_ci_scripts/pipeline/soc.groovy

+10-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,15 @@ def genericSoCMatterBuild(app, supportedBoards, ota_automation=false, ecosystem_
6666
cp ./out/${app.name}/${transportType}/${option.name}/${board.name}/*.s37 ${saved_workspace}/out/${option.name}/${board.name}/${transportType}/
6767
cp ./out/${app.name}/${transportType}/${option.name}/${board.name}/*.map ${saved_workspace}/out/${option.name}/${board.name}/${transportType}/
6868
"""
69-
stash name: transportType + 'Examples-'+app.name+'-'+board.name, includes: 'out/**/*.s37 '
69+
70+
if (family.isWiFi) // WiFi SoC generates as .rps file
71+
{
72+
sh """
73+
cp ./out/${app.name}/${transportType}/${option.name}/${board.name}/*.rps ${saved_workspace}/out/${option.name}/${board.name}/${transportType}/
74+
"""
75+
}
76+
77+
stash name: transportType + 'Examples-'+app.name+'-'+board.name, includes: 'out/**/*.s37,/out/**/*.rps '
7078
}
7179
}
7280
}
@@ -93,7 +101,7 @@ def genericSoCMatterBuild(app, supportedBoards, ota_automation=false, ecosystem_
93101
deactivateWorkspaceOverlay(advanceStageMarker.getBuildStagesList(),
94102
workspaceTmpDir,
95103
'matter/' + saved_workspace,
96-
'-name "*.s37" -o -name "*.map"')
104+
'-name "*.s37" -o -name "*.map" -o -name "*.rps"')
97105
}
98106
}
99107
}

0 commit comments

Comments
 (0)