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.

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

west.yml: update zephyr to 740d7f735e2 #9291

Merged

Conversation

tmleman
Copy link
Contributor

@tmleman tmleman commented Jul 9, 2024

Total of 369 commits.

Changes include:

46b356a6b0e intel-adsp: fix ACE power-off assembly
fb53d2ef8dd ace: power: replace pseudo-assembly movi

@kv2019i
Copy link
Collaborator

kv2019i commented Jul 9, 2024

@lyakh I don't think the power_down assembly changes are working out -- lot of fails on ACE20

Total of 369 commits.

Changes include:

46b356a6b0e intel-adsp: fix ACE power-off assembly
fb53d2ef8dd ace: power: replace pseudo-assembly movi

Signed-off-by: Tomasz Leman <tomasz.m.leman@intel.com>
@tmleman tmleman force-pushed the topic/upstream/pr/zephyr/upgrade/24ww28 branch from 4f3da74 to 6667f81 Compare July 12, 2024 12:59
@tmleman tmleman changed the title [DNM] west.yml: update zephyr to a4123a8ea2c west.yml: update zephyr to 740d7f735e2 Jul 12, 2024
@tmleman tmleman marked this pull request as ready for review July 12, 2024 13:01
@kv2019i kv2019i requested review from lyakh and abonislawski July 15, 2024 15:49
@kv2019i
Copy link
Collaborator

kv2019i commented Jul 16, 2024

Good to go, waiting for second +1 review so we can merge.

@kv2019i kv2019i merged commit 5a000e8 into thesofproject:main Jul 17, 2024
45 of 47 checks passed
@marc-hb
Copy link
Collaborator

marc-hb commented Jul 18, 2024

This Zephyr upgrade is likely part of the reasons that caused MTL to stop working entirely: #9308

@plbossart
Copy link
Member

I don't fully get how this Zephyr upgrade was successful CI-wise, but somehow post-merge we are in the weeds.

Does this point to a testing problem or an obsolete configuration used in tests @kv2019i ?

@kv2019i
Copy link
Collaborator

kv2019i commented Jul 18, 2024

@plbossart I think this is a feature of the current system. We can have cases where two PRs pass the tests independetly, but when they are both in the tree, the test fails. I think this happened here. To catch these, we'd have to trigger CI again for all other PRs, when we merge a PR and this would be very costly. @marc-hb can comment much better on the options we have.

@marc-hb
Copy link
Collaborator

marc-hb commented Jul 18, 2024

We can have cases where two PRs pass the tests independetly, but when they are both in the tree, the test fails

This is a well-known CI issue and Gitlab and Github have a solution for it:

https://about.gitlab.com/blog/2020/01/30/all-aboard-merge-trains/
https://github.blog/2023-07-12-github-merge-queue-is-generally-available/

The Chrome project also had some project-specific "merge queue" concept for a very long time.

I don't know whether Jenkins has something like this. Even if it has, this would be a major change not worth the effort for something that happens very rarely in SOF. We have much more frequent problems to solve first (for instance: merging known broken PRs). The solution above are designed for repos with a much higher churn, like Zephyr for instance. But even Zephyr does not use this; they just revert very quickly when this happens.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants