many: use `image-builder upload` in tests (HMS-10856) by supakeen · Pull Request #2476 · osbuild/image-builder

supakeen · 2026-06-30T05:30:46Z

Replace the upload parts of boot-(aws|azure) with image-builder upload. Had to add some options and move all the Azure upload code since it didn't exist yet.

supakeen · 2026-06-30T05:42:41Z

This all probably won't work as it likely needs secrets we can't currently pass on the commandline of image-builder.

supakeen · 2026-06-30T13:21:47Z

Ok; this needs to wire up boot-mode for AWS in the image-builder upload command to make it work for older RHELs which were BIOS-only.

supakeen · 2026-06-30T15:02:47Z

I cannot see the Snyk issue but otherwise this is ready for review.

supakeen · 2026-07-01T08:28:02Z

Ok; this is only failing on the dnf5 depsolver tests now; let's see if a rebase fixes that.

supakeen · 2026-07-01T09:06:57Z

Snyk errors are not relevant, the idiom already existed.

brlane-rht

Looks pretty good, just a few small questions.

Change UploadAndRegister to return *UploadResult and an error instead of error. The UploadResult struct carries the provider name and the cloud-specific image identifier. This allows callers to obtain the image ID after upload or any additional information that might be relevant.

Add --format flag to the upload command. After a successful upload, the new UploadResult is serialized and printed to stdout as yaml or json.

Move the upload logic from cmd/boot-azure into a new azureUploader that implements the cloud.Uploader interface. This handles storage account setup, page blob upload, and image registration for both x86_64 (standard image) and aarch64 (gallery image).

Wire the new Azure uploader into the upload command.

Remove the upload and image registration logic from boot-aws. The command now takes a pre-uploaded AMI ID via --ami instead of a local image file. Upload should be done separately via `image-builder upload --to=aws`.

Remove the upload and image registration bits from boot-azure. The command now requires a pre-uploaded image via --image (or --snapshot for Windows/WSL). Upload should be done separately via image-builder upload --to=azure.

Update the test scripts to use the new workflow: 1. Upload via image-builder upload --to=aws/azure --format=json 2. Boot via boot-aws --ami or boot-azure --image Add upload_to_aws() and upload_to_azure() helpers that call image-builder upload and parse the JSON result for the image ID.

Bump the seed to ensure all images get built and boot tested with the new tools. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>

The two places that use `pb` directly were writing their output to stdout while normally we write output of progress to stderr. Fix that, and the tests. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>

Allow specifying the AWS boot mode for a given upload. Sometimes it's necessary to set this. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>

Take the boot mode from `describe` and pass it to `image-builder upload`. Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>

supakeen · 2026-07-02T05:17:15Z

Looks pretty good, just a few small questions.

I've addressed all of them 🙂

brlane-rht

Looks good!

achilleas-k · 2026-07-03T13:21:01Z

Very nice and clean. Thank you!

avitova · 2026-07-03T12:28:52Z

+	requiredArgs := []string{"azure-client-id", "azure-client-secret", "azure-tenant", "azure-subscription", "azure-resource-group", "azure-image-name"}
+	for _, argName := range requiredArgs {
+		arg, err := cmd.Flags().GetString(argName)
+		if err != nil {
+			return nil, err
+		}
+		if arg == "" {
+			missing = append(missing, fmt.Sprintf("--%s", argName))
+		}
+	}


Since all of the args are required, we could also remove whatever is in the function before, and just do:

Suggested change

requiredArgs := []string{"azure-client-id", "azure-client-secret", "azure-tenant", "azure-subscription", "azure-resource-group", "azure-image-name"}

for _, argName := range requiredArgs {

arg, err := cmd.Flags().GetString(argName)

if err != nil {

return nil, err

}

if arg == "" {

missing = append(missing, fmt.Sprintf("--%s", argName))

}

}

usedArgs := make(map[string]string)

requiredArgs := []string{"azure-client-id", "azure-client-secret", "azure-tenant", "azure-subscription", "azure-resource-group", "azure-image-name"}

for _, argName := range requiredArgs {

arg, err := cmd.Flags().GetString(argName)

if err != nil {

return nil, err

}

if arg == "" {

missing = append(missing, fmt.Sprintf("--%s", argName))

} else {

usedArgs[argName] = arg

}

}

And then we return values from the map. Not necessary, might complicate things once we start using arguments that are not required, but I think worth thinking about?

supakeen · 2026-07-04T06:14:28Z

Failing with data race detections in the merge queue.

supakeen · 2026-07-04T07:19:29Z

I think we found this race here because we actually run with the race detector in this branch; I've opened a PR to address it and we'll need to rebase this PR (and likely others) after that lands: #2487

supakeen changed the title ~~wip: use image-builder upload in tests~~ wip: use image-builder upload in tests (HMS-10856) Jun 30, 2026

supakeen force-pushed the use-image-builder-upload branch 2 times, most recently from 38fdcf5 to 406a31d Compare June 30, 2026 10:48

supakeen force-pushed the use-image-builder-upload branch from 406a31d to cb828b9 Compare June 30, 2026 13:34

supakeen commented Jun 30, 2026

View reviewed changes

Comment thread test/scripts/imgtestlib/boot.py

supakeen force-pushed the use-image-builder-upload branch from cb828b9 to def9c07 Compare June 30, 2026 14:14

supakeen changed the title ~~wip: use image-builder upload in tests (HMS-10856)~~ many: use image-builder upload in tests (HMS-10856) Jun 30, 2026

supakeen marked this pull request as ready for review June 30, 2026 15:03

supakeen requested review from a team, achilleas-k and thozza as code owners June 30, 2026 15:03

supakeen requested a review from avitova June 30, 2026 15:03

supakeen force-pushed the use-image-builder-upload branch 2 times, most recently from 023d25d to 981ad76 Compare July 1, 2026 07:27

supakeen force-pushed the use-image-builder-upload branch from 981ad76 to a5020af Compare July 1, 2026 08:32