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

ci: install mkosi from repository #2233

Merged

Conversation

mkulke
Copy link
Collaborator

@mkulke mkulke commented Jan 10, 2025

As discussed in the last community call, we can adopt the installation method of the s390x builds and use it also for the amd64 builds. this allows us to use the profile feature available in more recent versions of mkosi and simplify some things.

here would be a successful build on a fork. due to the pull-request-target logic there will be a mismatch between Makefile (on PR branch) and github-actions workflow (on main), so it doesn't make sense to run e2e tests here.

@mkulke mkulke requested a review from a team as a code owner January 10, 2025 12:01
Install mkosi from the upstream project to align s390x and amd64 builds.

Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
@mkulke mkulke force-pushed the mkulke/install-mkosi-from-repo branch 6 times, most recently from dd0eb3f to 3187e27 Compare January 10, 2025 14:39
Copy link
Member

@wainersm wainersm left a comment

Choose a reason for hiding this comment

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

Tested locally on Fedora 40. Thanks @mkulke !

@mkulke
Copy link
Collaborator Author

mkulke commented Jan 13, 2025

@stevenhorsman the e2e tests will fail since the workflow and the Makefile were edited

Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

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

A couple of code tidying suggestions, but otherwise looks good assuming the tests pass

.github/workflows/podvm_mkosi.yaml Show resolved Hide resolved
src/cloud-api-adaptor/podvm-mkosi/Makefile Show resolved Hide resolved
@stevenhorsman
Copy link
Member

@stevenhorsman the e2e tests will fail since the workflow and the Makefile were edited

Good point - can we test (some of it) on a fork repo?

@mkulke mkulke force-pushed the mkulke/install-mkosi-from-repo branch from 3187e27 to 77652b3 Compare January 13, 2025 09:57
@mkulke
Copy link
Collaborator Author

mkulke commented Jan 13, 2025

@stevenhorsman the e2e tests will fail since the workflow and the Makefile were edited

Good point - can we test (some of it) on a fork repo?

yup, see PR description

@stevenhorsman
Copy link
Member

@stevenhorsman the e2e tests will fail since the workflow and the Makefile were edited

Good point - can we test (some of it) on a fork repo?

yup, see PR description

Sorry!

more recent version of mkosi can use Profile & Architecture in matches
clauses.

Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
@mkulke mkulke force-pushed the mkulke/install-mkosi-from-repo branch from 77652b3 to 291e3f3 Compare January 13, 2025 10:04
@mkulke mkulke requested a review from stevenhorsman January 13, 2025 10:04
Copy link
Member

@stevenhorsman stevenhorsman left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@mkulke mkulke merged commit 6e25be3 into confidential-containers:main Jan 13, 2025
36 of 37 checks passed
@mkulke mkulke deleted the mkulke/install-mkosi-from-repo branch January 13, 2025 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test_e2e_libvirt Run Libvirt e2e tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants