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

cmdlib: also chown back compose.json in privileged path #3967

Merged
merged 1 commit into from
Nov 22, 2024

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Nov 21, 2024

Match what we do for the repo and chown back compose.json to the build user. This should fix cosa build --force-image.

Match what we do for the repo and chown back `compose.json` to the build
user. This should fix `cosa build --force-image`.
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

LGTM

but.. TBH I'm almost of mind that the followup targets thing should be dropped from this code and we just rely on either cosa osbuild or cosa buildextend in the future, both of which have --force.

@dustymabe dustymabe enabled auto-merge (rebase) November 21, 2024 20:40
@jlebon
Copy link
Member Author

jlebon commented Nov 22, 2024

/retest

@jlebon
Copy link
Member Author

jlebon commented Nov 22, 2024

but.. TBH I'm almost of mind that the followup targets thing should be dropped from this code and we just rely on either cosa osbuild or cosa buildextend in the future, both of which have --force.

Hmm, --force-image is a weirdly-named option, but it's mostly unrelated to the followup targets logic. cosa build is the only command capable of creating new builds. Currently, a change to e.g. image.yaml must result in a new build. But we want to be smart enough to not rebuild the ostree as well. But sometimes, the change detection logic might not be smart enough to know that an image input has changed and a new build ID must be allocated, and that's where --force-image can be useful. A perfect example is actually for testing #3861, where I wanted to do two builds in a row, one with the legacy path, and one with the osbuild path, to compare them.

@dustymabe dustymabe merged commit 40a2027 into coreos:main Nov 22, 2024
5 checks passed
@dustymabe
Copy link
Member

Some fallout.. Multi-arch builds are failing in the cosa fetch with:

chown: cannot access '/home/jenkins/agent/workspace/build-arch/tmp/compose.json': No such file or directory

@jlebon
Copy link
Member Author

jlebon commented Nov 22, 2024

Some fallout.. Multi-arch builds are failing in the cosa fetch with:

chown: cannot access '/home/jenkins/agent/workspace/build-arch/tmp/compose.json': No such file or directory

Fixup in #3969!

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.

2 participants