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

Fixes for flatcar-workon #2080

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Fixes for flatcar-workon #2080

merged 3 commits into from
Jul 2, 2024

Conversation

krnowak
Copy link
Member

@krnowak krnowak commented Jul 2, 2024

The update_chroot calls flatcar_workon to get a list of workon packages to rebuild on SDK. But not passing --board flag to flatcar_workon means using default board (amd64-usr), so it really gets a list of packages from the board. But the script failed for me during the sdk_container job, because no board was set up that point.

So this PR adds back the --host flag to flatcar_workon (which used to be here in cros_workon) and makes update_chroot pass the new flag to the script.

Changes tested as a part of sdk-container job for merged-usr changes.

There are also logs for the failing job, search for amd64-usr has not been setup yet there.

krnowak added 2 commits July 2, 2024 12:11
Telling flatcar_workon to work on SDK instead of a board could be
implemented either by passing an empty value for --board flag and
modifying `${FLAGS_board+foo}` to `${FLAGS_board:+foo}` or by adding
the `--host` boolean flag and killing the value of `--board` flag when
`--host` is true.

I went with the latter as it clearly conveys meaning at the call
sites.
We want to possibly update workon packages on SDK, not on the default
board.
@krnowak krnowak requested a review from a team July 2, 2024 10:18
Copy link
Contributor

@chewi chewi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah! I intended for no --board argument to imply --host but I got that wrong. I did notice this late on Friday while doing my own build but hadn't looked into it yet. Thanks for fixing.

flatcar_workon Outdated Show resolved Hide resolved
Co-authored-by: James Le Cuirot <jlecuirot@microsoft.com>
@krnowak krnowak merged commit ec42290 into main Jul 2, 2024
1 check failed
@krnowak krnowak deleted the krnowak/flatcar-workon-fixes branch July 2, 2024 10:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

2 participants