Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

Fix updating of the manifest DB #106

Merged
merged 10 commits into from
Jan 3, 2024
Merged

Conversation

thozza
Copy link
Member

@thozza thozza commented Jan 2, 2024

#103 missed the fact that the cmd/gen-manifests from osbuild/images depends on dnf-json installed by osbuild-depsolve-dnf package. Fix this now.

Example failure: https://gitlab.com/redhat/services/products/image-builder/ci/manifest-db/-/jobs/5841293230

lavocatt
lavocatt previously approved these changes Jan 2, 2024
Copy link
Contributor

@lavocatt lavocatt left a comment

Choose a reason for hiding this comment

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

Excellent! Thanks for the fix

achilleas-k
achilleas-k previously approved these changes Jan 2, 2024
Copy link
Member

@achilleas-k achilleas-k left a comment

Choose a reason for hiding this comment

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

Wonderful! Thank you.

@achilleas-k achilleas-k enabled auto-merge (rebase) January 2, 2024 10:20
Copy link
Contributor

@jrusz jrusz left a comment

Choose a reason for hiding this comment

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

It's failing to install on centos-stream and rhel-nightly both 8 and 9, only GA rhel are working. It seems DNF can't find new enough osbuild-selinux package. I would expect it to be included the osbuild repo though...

EDIT: Actually I guess it needs selinux-policy and selinux-policy-targeted in newer version, so I guess newer rpmrepo snapshots?

@jrusz
Copy link
Contributor

jrusz commented Jan 2, 2024

osbuild repo has snaphots from 20231201, can you try updating them here as well @thozza ?

@thozza
Copy link
Member Author

thozza commented Jan 2, 2024

osbuild repo has snaphots from 20231201, can you try updating them here as well @thozza ?

yeah, I just found out about this dependency hell 😵‍💫

@thozza thozza dismissed stale reviews from achilleas-k and lavocatt via 50f4f4c January 2, 2024 13:55
thozza added 10 commits January 2, 2024 17:24
None of the scripts in this repository actually run or use
osbuild-composer binaries of tools. Manifests are generated from the
osbuild/images repository and they are built directly using osbuild.

The only situation when osbuild-composer is somewhat used is during the
manifest generation. Specifically, we need to install all build
dependencies of osbuild-composer before the manifest generation for the
tools in osbuild/images to compile. The reason is that osbuild/images
does not come with a SPEC file to enable us not using osbuild-composer
at all.

Modify the `deploy.sh` script to install only osbuild packages.

Signed-off-by: Tomáš Hozza <[email protected]>
Update osbuild to the latest `main`, to fix dependency issue with
selinux-policy on CentOS Stream.

Signed-off-by: Tomáš Hozza <[email protected]>
The `dnf-json` is moving to the osbuild/osbuild repo and the
`gen-manifests` tool from osbuild/images uses it already.

Signed-off-by: Tomáš Hozza <[email protected]>
The schutzbot/deploy.sh sets up the custom osbuild and osbuild-composer
repositories and installs necessary packages. Make sure that it is run
before any CI job is executed.

Signed-off-by: Tomáš Hozza <[email protected]>
osbuild is no longer testing any image builds on F35 and F36.

Signed-off-by: Tomáš Hozza <[email protected]>
This does not make much sense, since the globally pinned version is
newer.

Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
@thozza
Copy link
Member Author

thozza commented Jan 3, 2024

I resolved the dependency issue by updating used snapshots and also cleaned up a few other things... The repo could use some more love, such as not using EOL Fedora releases, but this is out of scope for my PR...

Copy link
Contributor

@jrusz jrusz left a comment

Choose a reason for hiding this comment

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

LGTM

@achilleas-k achilleas-k merged commit f25f85a into osbuild:main Jan 3, 2024
4 checks passed
@thozza thozza deleted the fix-db-update branch January 3, 2024 08:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants