Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[nrf fromtree] twister: Allow sharing hardware platform between variants #2292

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[nrf fromtree] twister: Allow sharing hardware platform between variants #2292

wants to merge 2 commits into from
+77 −34

Conversation

gchwier
Copy link
Contributor

@gchwier gchwier commented Nov 22, 2024

Cherry-picked from upstream.
PR: zephyrproject-rtos/zephyr#81465

Extended hardware map to share a single board between variants. To run tests for different variants on the same board without re-configuring the hardware map file for each variant, one can extend the platform attribute with board names separated by spaces or use platform as a list.

@NordicBuilder NordicBuilder mentioned this pull request Nov 22, 2024
Open
@gchwier
Copy link
Contributor Author

gchwier commented Nov 22, 2024

Rebased and cherry-picked comit from PR: zephyrproject-rtos/zephyr#79578
to fix blackbox tests.

@gchwier
Copy link
Contributor Author

gchwier commented Nov 26, 2024

@PerMac please review.
Here is one problem with compliance check - pylint issue with importing module in twister blackbox tests. This issue does not appear in the Upstream, probable something is wrong with configuration. This is minor issue. I can remove that commit with twister blackbox fix, but then we will have a failed blackbox test.

@PerMac
Copy link
Contributor

PerMac commented Nov 26, 2024

@carlescufi As Grzegorz wrote, It seems we won't pass compliance on this. Can you merge it without it? It is useful for hw setups testing multiple variants of our boards

gchwier and others added 2 commits November 26, 2024 16:42
@gchwier
[nrf fromtree] twister: Allow sharing hardware platform between variants
037b77c 
Extended hardware map to share a single board between variants.
To run tests for different variants on the same board
without re-configuring the hardware map file for each variant,
one can use a `platform` atribute as a list of names.

Signed-off-by: Grzegorz Chwierut <[email protected]>
(cherry picked from commit e0bd7e7c8704412b41ad7dbd7395044ea26f12b4)
@golowanow @gchwier
[nrf fromtree] twister: blackbox: coverage: fix matching pattern
986f2f9 
Fix the expected pattern randomly matched to coverage.json contents
ordered differently at test_coverage_basedir().

Signed-off-by: Dmitrii Golovanov <[email protected]>
(cherry picked from commit 27456ed)
@gchwier
Copy link
Contributor Author

gchwier commented Nov 27, 2024

@carlescufi to fix issue with pylint, we can add line
# pylint: disable=no-name-in-module in test_coverage.py file.
It is added in Upstream with that commit:
zephyrproject-rtos/zephyr@abfeb6a
however, we do not want to cherry-pick that one, because there are other not related changes (better to wait and pick it with next upmerge)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nordic-piks nordic-piks nordic-piks approved these changes

@PerMac PerMac PerMac approved these changes

@katgiadla katgiadla katgiadla approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@gchwier @PerMac @katgiadla @nordic-piks @golowanow