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

Bump ostree-ext and cap-std #3360

Merged
merged 1 commit into from
Jan 28, 2022
Merged

Conversation

cgwalters
Copy link
Member

Note both ostree-ext and us depend on cap-std/rustix, so we
should keep those in lockstep to avoid duplication.

We can drop the cap-primitives dependency now.

lucab
lucab previously approved these changes Jan 26, 2022
@cgwalters
Copy link
Member Author

Argh, right I think ostreedev/ostree-rs-ext#220 broke backwards compatibility. We need to make the "inject mode bits into tar stream" continue to happen in v0 format or so - @lucab want to do that or should I?

@cgwalters
Copy link
Member Author

Upgrade tests are failing:

[2022-01-26T15:56:08.240Z] --- FAIL: fcos.upgrade.basic (53.75s)
[2022-01-26T15:56:08.240Z]     --- FAIL: fcos.upgrade.basic/setup (27.02s)
[2022-01-26T15:56:08.240Z]             cluster.go:213: "rpm-ostree ex-container import --repo=/var/srv/upgrade/repo-bare --write-ref fedora/x86_64/coreos/next ostree-unverified-image:oci-archive:fedora-coreos-35.20220126.dev.0-ostree.x86_64.ociarchive:latest" failed: Process exited with status 1; logs from journalctl -t kola:
[2022-01-26T15:56:08.240Z]     + ostree --repo=/var/srv/upgrade/repo-bare init --mode=bare-user
[2022-01-26T15:56:08.240Z]     + rpm-ostree ex-container import --repo=/var/srv/upgrade/repo-bare --write-ref fedora/x86_64/coreos/next ostree-unverified-image:oci-archive:fedora-coreos-35.20220126.dev.0-ostree.x86_64.ociarchive:latest
[2022-01-26T15:56:08.240Z]     error: Importing ostree-unverified-image:oci-archive:fedora-coreos-35.20220126.dev.0-ostree.x86_64.ociarchive:latest: Parsing blob sha256:830ed6ce6a92aada6b4e4243c1b9a9807f0d433dc17b23a8eb9f6d2172c5adec: object 7f/b2bf47d8f85065a1e23102c77212df527c560d9b04ca33a83cd191aabc6d3d.file: Processing content object 7fb2bf47d8f85065a1e23102c77212df527c560d9b04ca33a83cd191aabc6d3d: Writing content object: Unsupported file type 0

@cgwalters cgwalters force-pushed the bump-ostree-ext-0.6.1 branch 2 times, most recently from 0e57b9e to 66b7100 Compare January 27, 2022 14:12
@cgwalters
Copy link
Member Author

OK exciting, new failure in the upgrade tests:

Jan 27 15:12:20.941468 rpm-ostree[1125]: error: Couldn't start daemon: Error setting up sysroot: loading sysroot: Unexpected state: /run/ostree-booted found, but no /boot/loader directory

I don't understand that.

@cgwalters
Copy link
Member Author

Oh wait I see this time the basic kola test immediately dies too with:

[ 2.068661] ostree-prepare-root[212]: ostree-prepare-root: Couldn't find specified OSTree root '/sysroot//ostree/boot.1/fedora-coreos/18c33ffc57e373e88aca2a9204bf89f826d49d862b454001e9fa302bfa352e9d/0': No such file or directory[ 2.224449] systemd[1]: Stopped OSTree Prepare OS/.

So something more fundamental is wrong here. Did another PR with just doc changes to sanity check CI.

@lucab
Copy link
Contributor

lucab commented Jan 27, 2022

In the upgrade failure, it looks like indeed the mount unit for /boot did not run. Puzzling.

Note both ostree-ext and us depend on cap-std/rustix, so we
should keep those in lockstep to avoid duplication.

We can drop the `cap-primitives` dependency now.
@cgwalters cgwalters force-pushed the bump-ostree-ext-0.6.1 branch from 66b7100 to 5e0d449 Compare January 27, 2022 20:05
@cgwalters
Copy link
Member Author

Rebased 🏄

@cgwalters
Copy link
Member Author

/retest

@cgwalters cgwalters enabled auto-merge (rebase) January 27, 2022 22:14
@cgwalters cgwalters merged commit 2a9e243 into coreos:main Jan 28, 2022
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.

3 participants