Skip to content

Commit

Permalink
Pull request project-chip#1622: Port commander fixes
Browse files Browse the repository at this point in the history 
Merge in WMN_TOOLS/matter from port_commander_fixes to RC_2.3.0-1.3-alpha.3

Squashed commit of the following:

commit 13b749c3a62555c9f448759954acd8d5e8b501e7
Author: Curtis Rahman <[email protected]>
Date:   Thu Mar 7 16:15:06 2024 -0500

    Check out tag vs. branch

commit 02d6aef152aaa91e9fca9c94a992edd6f8d2a15e
Author: Curtis Rahman <[email protected]>
Date:   Fri Mar 1 19:15:32 2024 +0000

    Pull request project-chip#1600: [MATTER-3226] Update commander to checkout latest released in build/sanity/SQA

    Merge in WMN_TOOLS/matter from feature/update_commander_smg to silabs

    Squashed commit of the following:

    commit 31c61d92bb9b6a69714f01acc8d6b46fe470855b
    Author: Curtis Rahman <[email protected]>
    Date:   Tue Feb 27 13:47:25 2024 -0500

        Changed to checkout latest commander in both build and sanity/SQA
  • Loading branch information
@CuRahman @mkardous-silabs
CuRahman authored and mkardous-silabs committed Mar 7, 2024
1 parent cb332b4 commit 2b6af17
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 7 deletions.
34 changes: 28 additions & 6 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def initWorkspaceAndScm()

dir('commander'){
checkout scm: [$class : 'GitSCM',
branches : [[name: pipelineMetadata.commander_info.commanderBranch]],
branches : [[name: pipelineMetadata.commander_info.commanderTag]],
browser : [$class: 'Stash', repoUrl: pipelineMetadata.commander_info.browserUrl],
userRemoteConfigs : [[credentialsId: 'svc_gsdk', url: pipelineMetadata.commander_info.gitUrl]]]

Expand Down Expand Up @@ -540,12 +540,12 @@ def utfThreadTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,boar
globalLock(credentialsId: 'hwmux_token_matterci', deviceGroup: deviceGroup) {
node(nomadNode)
{
sh 'printenv'
ws('/home/dockerUser/qaWorkspace/')
{

dir('utf_app_matter')
{
def commanderDir = ""
sshagent(['svc_gsdk-ssh']) {
checkout scm: [$class : 'GitSCM',
branches : [[name: 'RC_2.3.0-1.3']],
Expand All @@ -560,6 +560,19 @@ def utfThreadTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,boar
sh ''' git clean -ffdx
git submodule foreach --recursive -q git reset --hard -q
git submodule foreach --recursive -q git clean -ffdx -q '''
dir('commander'){
checkout scm: [$class : 'GitSCM',
branches : [[name: pipelineMetadata.commander_info.commanderTag]],
browser : [$class: 'Stash', repoUrl: pipelineMetadata.commander_info.browserUrl],
userRemoteConfigs : [[credentialsId: 'svc_gsdk-ssh', url: pipelineMetadata.commander_info.gitUrl]]]

sh "git checkout ${pipelineMetadata.commander_info.commanderTag}"
commanderPath = sh(script: "find " + pwd() + " -name 'commander' -type f -print",returnStdout: true).trim()
echo commanderPath
sh "${commanderPath} -v"
commanderDir = commanderPath - "/commander"
echo commanderDir
}
}

dir('matter')
Expand Down Expand Up @@ -603,14 +616,19 @@ def utfThreadTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,boar
'PUBLISH_RESULTS=true', // unneeded?
'RUN_TCM_SETUP=false', // unneeded?
"MATTER_CHIP_TOOL_PATH=${chiptoolPath}" ,
'DEBUG=true'
'DEBUG=true',
"UTF_COMMANDER_PATH=${commanderPath}",
"TCM_SIMPLICITYCOMMANDER=${commanderPath}",
"SECMGR_COMMANDER_PATH=${commanderPath}",
"PATH+COMMANDER_PATH=${commanderDir}"
])
{
catchError(buildResult: 'UNSTABLE',
catchInterruptions: false,
message: "[ERROR] One or more tests have failed",
stageResult: 'UNSTABLE')
{
sh 'printenv'
sh """
echo ${MATTER_CHIP_TOOL_PATH}
ls -al ${MATTER_CHIP_TOOL_PATH}
Expand All @@ -635,12 +653,12 @@ def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,
globalLock(credentialsId: 'hwmux_token_matterci', deviceGroup: deviceGroup) {
node(nomadNode)
{
sh 'printenv'
ws('/home/dockerUser/qaWorkspace/')
{

dir('utf_app_matter')
{
def commanderDir = ""
sshagent(['svc_gsdk-ssh']) {
checkout scm: [$class : 'GitSCM',
branches : [[name: 'RC_2.3.0-1.3']],
Expand All @@ -659,13 +677,16 @@ def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,

dir('commander'){
checkout scm: [$class : 'GitSCM',
branches : [[name: pipelineMetadata.commander_info.commanderBranch]],
branches : [[name: pipelineMetadata.commander_info.commanderTag]],
browser : [$class: 'Stash', repoUrl: pipelineMetadata.commander_info.browserUrl],
userRemoteConfigs : [[credentialsId: 'svc_gsdk-ssh', url: pipelineMetadata.commander_info.gitUrl]]]

sh "git checkout ${pipelineMetadata.commander_info.commanderTag}"
commanderPath = sh(script: "find " + pwd() + " -name 'commander' -type f -print",returnStdout: true).trim()
echo commanderPath
sh "${commanderPath} -v"
commanderDir = commanderPath - "/commander"
echo commanderDir
}
}

Expand Down Expand Up @@ -724,7 +745,8 @@ def utfWiFiTestSuite(nomadNode,deviceGroup,testBedName,appName,matterType,board,
'DEBUG=true',
"UTF_COMMANDER_PATH=${commanderPath}",
"TCM_SIMPLICITYCOMMANDER=${commanderPath}",
"SECMGR_COMMANDER_PATH=${commanderPath}"
"SECMGR_COMMANDER_PATH=${commanderPath}",
"PATH+COMMANDER_PATH=${commanderDir}"
])
{
catchError(buildResult: 'UNSTABLE',
Expand Down
2 changes: 1 addition & 1 deletion pipeline_metadata.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
commanderBranch: 'master'
browserUrl: 'https://stash.silabs.com/projects/TOOLCHAIN_INTERNAL/repos/simplicity_commander_linux_x64'
gitUrl: 'ssh://[email protected]/toolchain_internal/simplicity_commander_linux_x64.git'
commanderTag: 'simplicity_commander_linux_x64_rel_1_16_0'
commanderTag: 'simplicity_commander_linux_x64_rel_1_16_5'

0 comments on commit 2b6af17

Please sign in to comment.