Generate manifests using tooling and configs from osbuild/images #4183
Commits on Aug 8, 2024
-
tools: new script gen-manifests
A new script to replace ./cmd/gen-manifests. The script queries the go dependencies to get the version of osbuild/images that osbuild-composer currently depends on, clones the osbuild/images repository at that version, and uses the ./cmd/gen-manifests tool from there to generate new manifests. This is meant to replace ./cmd/gen-manifests so that we only have one command and set of configurations for generating manifests, to avoid drift between the two implementations.
-
cmd/osbuild-image-tests: change json tag for request
The manifests generated by osbuild/images use the property name 'build-request' instead of 'compose-request'.
-
tools/gen-manifests: add arguments for filtering
Support arguments for filtering and pass them straight through to gen-manifests (multiple values and globs are supported). `set -x` before running the gen-manifests tool to print the full command.
-
tools/gen-manifests: go run with exclude_graphdriver_btrfs
This is required for building the binary on RHEL. It has no effect on manifest generation, so we can use it unconditionally.
-
-
Update the test README with information about the new script.
-
tools: remove the old test case generation configs
Remove the format-request-map and repos that were used for the old manifest generation. The new manifest generator uses the configs and repos defined in osbuild/images.
-
Remove the gen-manifests go cmd since we now only rely on the one in osbuild/images.
-
test/data/manifests: update Fedora manifests
Updated only manifests for image types that were already in the repository. This commit also adds Fedora 40 manifests. Generated with: rm ./test/data/manifests/fedora* ./tools/gen-manifests 'fedora-*' 'x86_64,aarch64' 'iot-commit,iot-container,iot-installer,iot-raw-image,container,live-installer,minimal-raw,oci,openstack,qcow2,vmdk' -
test/data/manifests: update CentOS manifests
Updated only manifests for image types that were already in the repository. This commit also adds CentOS 10 manifests. Generated with: rm ./test/data/manifests/centos* ./tools/gen-manifests 'centos-*' '*' 'minimal_raw,openstack,qcow2,tar,oci,vmdk' -
test/data/manifests: update RHEL manifests
Updated only manifests for image types that were already in the repository. The commit also adds RHEL 10 manifests and removes manifests for distros without minor version, rhel-7, rhel-8, and rhel-9. Generated with: rm ./test/data/manifests/rhel* ./tools/gen-manifests 'rhel-*' '*' 'azure-rhui,gce-rhui,minimal-raw,openstack,qcow2,tar,vmdk'
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.