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.

Sign up for GitHub

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

Generate manifests using tooling and configs from osbuild/images #4183

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Generate manifests using tooling and configs from osbuild/images #4183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fa8abcf
tools: new script gen-manifests
achilleas-k Jun 3, 2024
2e71ce8
cmd/osbuild-image-tests: change json tag for request
achilleas-k Jun 3, 2024
643c218
tools/gen-manifests: add arguments for filtering
achilleas-k Jun 3, 2024
67d4c10
tools/gen-manifests: go run with exclude_graphdriver_btrfs
achilleas-k Jun 3, 2024
a399000
tools/gen-manifests: set the OSBUILD_TESTING_RNG_SEED
achilleas-k Jun 3, 2024
4003fea
test: update the README
achilleas-k Jun 3, 2024
91d8c99
tools: remove the old test case generation configs
achilleas-k Jun 3, 2024
509a9a2
cmd: remove gen-manifests
achilleas-k Jun 3, 2024
2b86185
test/data/manifests: update Fedora manifests
achilleas-k Jun 3, 2024
879793e
test/data/manifests: update CentOS manifests
achilleas-k Jun 3, 2024
5eaffcb
test/data/manifests: update RHEL manifests
achilleas-k Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
555 changes: 0 additions & 555 deletions cmd/gen-manifests/main.go
View file
Open in desktop

This file was deleted.

117 changes: 0 additions & 117 deletions cmd/gen-manifests/workerqueue.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/osbuild-image-tests/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type testcaseStruct struct {
Distro string
Arch string
Filename string
} `json:"compose-request"`
} `json:"build-request"`
Manifest json.RawMessage
ImageInfo json.RawMessage `json:"image-info"`
Boot *struct {
Expand Down
26 changes: 17 additions & 9 deletions test/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,19 +101,27 @@ Each file contains a sample manifest for an image configuration and some
metadata describing the request that created the manifest and all the content
(packages, containers, ostree commits).

To (re)generate these test cases use the tool `cmd/gen-manifests`.
To (re)generate these test cases use the tool `./tools/gen-manifests`.
The tool clones the [osbuild/images](https://github.com/osbuild/images)
repository at the version specified in the `go.mod` file and runs the
`cmd/gen-manifests` tool to generate the manifests with the default
configurations.

Manifest generation can be restricted to only some distributions,
architectures, or image types using positional arguments:
- distros: comma-separated list of distribution names to generate manifests for
- arches: comma-separated list of architectures to generate manifests for
- images: comma-separated list of image types to generate manifests for

All three arguments support globs. For example:
```
go run ./cmd/gen-manifests
./tools/gen-manifests `rhel-9.*` `*64*` `*rhui*`
```
will generate all manifests using the default options.

Manifest generation can be restricted to only some distributions,
architectures, or image types using command line flags.
will generate manifests for all RHEL 9.x versions, for `x86_64` and `aarch64`,
and only image types that have `rhui` in their name.

The command uses the configurations in
`tools/test-case-generators/format-request-map.json` and repositories defined
in `tools/test-case-generators/repos.json`.
See the [relevant documentation in osbuild/images](https://github.com/osbuild/images/blob/b002d250372ff468a2250ba0e44ed7e45a501e54/docs/developer/cmds.md#manifest-generation)
for more details on the gen-manifests command.

### Setting up Azure upload tests

Expand Down
Loading
Loading