NOJIRA : update script to update CSA_Versions as well#180
NOJIRA : update script to update CSA_Versions as well#180sarthak shaha (Sarthak-Shaha) wants to merge 1 commit intomainfrom
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR updates the version update script to automatically maintain the CSA Matter version in Jenkins configuration files. Previously, the CSA_MATTER_VERSION was hardcoded in the Jenkins configuration, but now it will be dynamically updated when running the version update script.
- Adds logic to update CSA_MATTER_VERSION in Jenkinsfile using the AUX_VERSION variable
- Updates jenkinsFunctions.groovy to use the CSA_MATTER_VERSION variable instead of hardcoded "1.4"
- Defines CSA_MATTER_VERSION at the top of Jenkinsfile with initial value "1.5"
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| slc/script/update_version.py | Adds automated update of CSA_MATTER_VERSION in Jenkinsfile |
| jenkins_integration/jenkinsFunctions.groovy | Changes hardcoded version to use variable |
| jenkins_integration/Jenkinsfile | Adds CSA_MATTER_VERSION variable definition |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| "TCM_SIMPLICITYCOMMANDER=${commanderPath}", | ||
| "SECMGR_COMMANDER_PATH=${commanderPath}", | ||
| "CSA_MATTER_VERSION=1.4", | ||
| "CSA_MATTER_VERSION=${CSA_MATTER_VERSION}", |
There was a problem hiding this comment.
Does this line do anything?
There was a problem hiding this comment.
Used by SQA for determining what test cases to run
|
To clarify, CSA_MATTER_VERSION is extracted from the user input to the script. For example if the input is "2.8.0-1.5" then CSA_MATTER_VERSION is set to 1.5. |
…ing OT's uartdrv_uart.c into the build when Matter thread doesn't use matter_thread_cli
Merge in WMN_TOOLS/matter_extension from fix/slim_build to release_2.5-1.4
Squashed commit of the following:
commit 75de1c801df0babb0645c9cee1814f809c80b57a
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu Nov 21 21:01:15 2024 -0500
Remove the unless condition, it didn't work
commit 49dafbfc8aeada52540f02788f30179efda812dc
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu Nov 21 16:39:09 2024 -0500
Temp fix to avoid pullling OT's uartdrv_uart.c into the build when Matter thread doesn't use matter_thread_cli
….12.0-rc2.1 and fix for rainier
Merge in WMN_TOOLS/matter_extension from bump_sisdk_to_fc2 to release_2.5-1.4
Squashed commit of the following:
commit 8a20d3a936c1ecb51cecaf63ee71f60e6c962c0b
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu Dec 5 21:27:50 2024 -0500
bump matter_sdk matter_private to merged shas
commit 30aa665a57bbb7ecb91458ace6e86797e2a87a6e
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu Dec 5 17:15:07 2024 -0500
add PSA_KEY_SLOTS for matter psa crypto
commit bd30d400fc50a92c19a165fee8b237e558112132
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Thu Dec 5 11:46:08 2024 -0500
Bump matter_sdk to fix non provisionned commissioning, fixup copypaste error JLinkDevices
commit 082b1cf180638f4676989064ce69a51a1063730a
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Wed Dec 4 21:01:21 2024 -0500
Fix component for 917 crypto needs. Fix config redefinition for series 3 causing some crash with new slc-cli version
commit c7082010fe159b81cfea9545d004dcb37bd00e71
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Mon Dec 2 10:27:50 2024 -0500
Bump sisdk to rc2.1 Add ot_uart_implemention in matter_uart.slcc to leverage our uart implementation and now ot's
Bring need PSA Crypto changes from matter_sdk. Update libchipcrypto.slcc to use PSASessionKeyStore
bump matter private
fixup sisdk tag name (fc2.1 ->rc2.1)
commit 1d3a71d7d57d6d3a8f0859566f05c5ecdc651826
Author: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Mon Dec 2 10:11:57 2024 -0500
Revert "Pull request SiliconLabsSoftware#180: NOJIRA: Temp fix to avoid pullling OT's uartdrv_uart.c into the build when Matter thread doesn't use matter_thread_cli"
This reverts commit 7c45575.
sarthak shaha (Sarthak-Shaha)
force-pushed
the
task/update_CSA_SPEC_VERSION
branch
from
26d8958 to
a1e7c6f
Compare
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| @@ -1,5 +1,6 @@ | |||
| #!groovy | |||
| @Library('gsdk-shared-lib@master') | |||
| def CSA_MATTER_VERSION = "1.5" | |||
There was a problem hiding this comment.
Bug: Variable Scope Blocks Loaded Script Access
The CSA_MATTER_VERSION variable is defined with def, making it local to the Jenkinsfile scope. When jenkinsFunctions.groovy is loaded via load and tries to reference CSA_MATTER_VERSION at line 137, it won't have access to this variable because loaded Groovy scripts cannot access def-scoped variables from the parent. Remove def to make it a binding variable accessible to loaded scripts, or pass it as a parameter to execute_sanity_tests.
There was a problem hiding this comment.
I don't know if this is true and didn't have time to look it up but it would be good to validate and apply the fix if true
Issue Link:
NOJIRA
Description of Problem/Feature:
Need to update csa version in jenkinsfile for sqa use case
Description of Fix/Solution:
Updated update version script to handle it
Testing Done:
Ran the script locally with empty "" and also with wrong version, script updated CSA_MATTER_VERSION correctly
Note
Introduces a CSA_MATTER_VERSION variable in Jenkins and updates the version script to automatically set it from the AUX version.
CSA_MATTER_VERSIONinjenkins_integration/Jenkinsfileand use it injenkinsFunctions.groovy(replaces hardcoded"1.5").slc/script/update_version.pyto, whenFULL_VERSIONis provided, updatejenkins_integration/JenkinsfileCSA_MATTER_VERSIONto the AUX version and ensurematter_docs.xmlversion strings are updated.Written by Cursor Bugbot for commit a1e7c6f. This will update automatically on new commits. Configure here.