Skip to content

Commit

Permalink
Pull request #110: [MATTER-752] Remove concatentaion of -app
Browse files Browse the repository at this point in the history 
Merge in WMN_TOOLS/matter from fix/MATTER-752 to silabs

Squashed commit of the following:

commit f07fd1cf1c1996f2636302115edc357156c11eef
Author: Shadi Makdissi <[email protected]>
Date:   Fri Sep 16 14:34:12 2022 -0400

    update following Yulina's comment

commit 3cb686e43424b6c18d4101d19ca15ffdee0116a5
Author: Shadi Makdissi <[email protected]>
Date:   Fri Sep 16 14:14:01 2022 -0400

    remove concatentaion of -app
  • Loading branch information
@Shadi-Silabs @jmartinez-silabs
Shadi-Silabs authored and jmartinez-silabs committed May 1, 2023
1 parent f401588 commit 71fad08
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions Jenkinsfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ def openThreadTestSuite(devicegoup, name, board)
dir('matter')
{
sh 'pwd '
stashFolder = 'OpenThreadExamples-'+name+"-app-"+board
stashFolder = 'OpenThreadExamples-'+name+'-'+board
echo "unstash folder: "+stashFolder
unstash stashFolder
unstash 'ChipTool'
Expand All @@ -452,7 +452,7 @@ def openThreadTestSuite(devicegoup, name, board)
}


def ci_path="${WORKSPACE}/matter/out/CSA/"+name+"-app/OpenThread/standard/"
def ci_path="${WORKSPACE}/matter/out/CSA/"+name+"/OpenThread/standard/"
echo "ci_path: "+ci_path

withEnv([ 'TEST_SCRIPT_REPO=matter-scripts',
Expand Down Expand Up @@ -532,7 +532,7 @@ def utfThreadTestSuite(devicegoup,testbed_name,app_name, matter_type , board, te
dir('matter')
{
sh 'pwd '
stashFolder = 'OpenThreadExamples-'+app_name+"-app-"+board
stashFolder = 'OpenThreadExamples-'+app_name+'-'+board
echo "unstash folder: "+stashFolder
unstash stashFolder
unstash 'ChipTool'
Expand All @@ -547,7 +547,7 @@ def utfThreadTestSuite(devicegoup,testbed_name,app_name, matter_type , board, te
echo $chiptoolPath
'''

sh "cp out/CSA/${app_name}-app/OpenThread/standard/${board}/*.s37 ../manifest"
sh "cp out/CSA/${app_name}/OpenThread/standard/${board}/*.s37 ../manifest"

}

Expand Down Expand Up @@ -641,7 +641,7 @@ def utfWiFiTestSuite(devicegoup, testbed_name, app_name, matter_type, board, wif

dir('matter')
{
stashFolder = 'WiFiExamples-'+app_name+'-app-'+board+'-'+wifi_module
stashFolder = 'WiFiExamples-'+app_name+'-'+board+'-'+wifi_module
unstash stashFolder
unstash 'ChipTool'
unstash 'BootLoader'
Expand All @@ -655,7 +655,7 @@ def utfWiFiTestSuite(devicegoup, testbed_name, app_name, matter_type, board, wif
echo $chiptoolPath
'''

sh "cp out/${app_name}-app_wifi_${wifi_module}/${board}/*.s37 ../manifest"
sh "cp out/${app_name}_wifi_${wifi_module}/${board}/*.s37 ../manifest"

}

Expand Down Expand Up @@ -894,14 +894,14 @@ def pipeline()
//even openthread test in parallel, they actually run in sequence as they are using same raspi
def parallelNodes = [:]

parallelNodes['Junit lighting BRD4161A'] = { this.openThreadTestSuite('qa-yinyi-1','lighting','BRD4161A') }
// parallelNodes['Junit lighting BRD4187A'] = { this.openThreadTestSuite('qa-yinyi-1','lighting','BRD4187A') }
parallelNodes['Junit lighting BRD4161A'] = { this.openThreadTestSuite('qa-yinyi-1','lighting-app','BRD4161A') }
// parallelNodes['Junit lighting BRD4187A'] = { this.openThreadTestSuite('qa-yinyi-1','lighting-app','BRD4187A') }

parallelNodes['lighting Thread BRD4187C'] = { this.utfThreadTestSuite('utf_matter_thread','matter_thread','lighting','thread','BRD4187C','',"/manifest-4187-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread.yaml") }
parallelNodes['lighting Thread BRD4161A'] = { this.utfThreadTestSuite('utf_matter_thread','matter_thread','lighting','thread','BRD4161A','',"/manifest-4161-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread_4161.yaml") }
parallelNodes['lighting Thread BRD2703A'] = { this.utfThreadTestSuite('utf_matter_thread_2','matter_thread_2','lighting','thread','BRD2703A','',"/manifest-2703-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread.yaml") }
parallelNodes['lighting Thread BRD4187C'] = { this.utfThreadTestSuite('utf_matter_thread','matter_thread','lighting-app','thread','BRD4187C','',"/manifest-4187-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread.yaml") }
parallelNodes['lighting Thread BRD4161A'] = { this.utfThreadTestSuite('utf_matter_thread','matter_thread','lighting-app','thread','BRD4161A','',"/manifest-4161-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread_4161.yaml") }
parallelNodes['lighting Thread BRD2703A'] = { this.utfThreadTestSuite('utf_matter_thread_2','matter_thread_2','lighting-app','thread','BRD2703A','',"/manifest-2703-thread","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence_thread.yaml") }

parallelNodes['lighting rs9116 BRD4161A'] = { this.utfWiFiTestSuite('utf_matter_ci','INT0014944','lighting','wifi','BRD4161A','rs911x','',"/manifest","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence.yaml") }
parallelNodes['lighting rs9116 BRD4161A'] = { this.utfWiFiTestSuite('utf_matter_ci','INT0014944','lighting-app','wifi','BRD4161A','rs911x','',"/manifest","--tmconfig tests/.sequence_manager/test_execution_definitions/matterci_test_sequence.yaml") }

parallelNodes.failFast = false
parallel parallelNodes
Expand Down

0 comments on commit 71fad08

Please sign in to comment.