Skip to content

Conversation

@marmijo
Copy link
Member

@marmijo marmijo commented Sep 10, 2025

The build artifact is not needed in the AWS WIndows License Included (WinLI) case because the image is built from an existing snapshot. To allow individual cloud providers to override this requirement, move the build artifact check to each provider's wrapper. Don't perform the check in the AWS wrapper if building a winli image.

Also modify the AWS ore upload code to not require an upload file when a source snapshot is used, which allows the WinLI image to be built without the need for an upload file.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request refactors the build artifact check to support AWS Windows License Included (WinLI) builds, which are created from an existing snapshot and do not require a build artifact. The changes correctly move the artifact check from a generic wrapper to individual cloud provider implementations, with a special exception for AWS WinLI. The AWS ore command is also updated to not require a file when a source snapshot is used. The implementation is solid, with just one minor suggestion to improve a command-line error message for better user experience.

The build artifact is not needed in the AWS WIndows License Included
(WinLI) case because the image is built from an existing snapshot.
To allow individual cloud providers to override this requirement,
move the build artifact check to each provider's wrapper. Don't
perform the check in the AWS wrapper if building a winli image.

Also modify the AWS ore upload code to not require an upload file
when a source snapshot is used, which allows the WinLI image to be
built without the need for an upload file.
@marmijo marmijo force-pushed the winli-build-artifact branch from 3f9942d to 641aa63 Compare September 10, 2025 19:11
marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Sep 10, 2025
The AWS ore wrapper relies on information from image.json. Buildfetch
the ostree artifact before creating and replicating the AWS Windows
License Included (winli) image to be consistent and use the same values
as the original AMI.

Also, remove the hack to get around buildfetch'ing the vmdk image since
the build artifact is no longer required in the winli build case.

See: coreos/coreos-assembler#4315
@marmijo
Copy link
Member Author

marmijo commented Sep 10, 2025

golangci-lint is failing due to: #4254

Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

LGTM

marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Sep 16, 2025
The AWS ore wrapper relies on information from image.json. Buildfetch
the ostree artifact before creating and replicating the AWS Windows
License Included (winli) image to be consistent and use the same values
as the original AMI.

Also, remove the hack to get around buildfetch'ing the vmdk image since
the build artifact is no longer required in the winli build case.

See: coreos/coreos-assembler#4315
marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Sep 16, 2025
The AWS ore wrapper relies on information from image.json. Buildfetch
the ostree artifact before creating and replicating the AWS Windows
License Included (winli) image to be consistent and use the same values
as the original AMI.

Also, remove the hack in libcloud.groovy to get around buildfetch'ing
the vmdk image since the build artifact is no longer required in the
winli build case.

See: coreos/coreos-assembler#4315
marmijo added a commit to marmijo/fedora-coreos-pipeline that referenced this pull request Sep 16, 2025
The AWS ore wrapper relies on information from image.json. Buildfetch
the ostree artifact before creating and replicating the AWS Windows
License Included (winli) image to be consistent and use the same values
as the original AMI.

Also, remove the hack in libcloud.groovy to get around buildfetch'ing
the vmdk image since the build artifact is no longer required in the
winli build case.

See: coreos/coreos-assembler#4315
@marmijo marmijo enabled auto-merge (rebase) September 16, 2025 19:16
@marmijo marmijo disabled auto-merge September 16, 2025 19:17
@dustymabe dustymabe merged commit d3ea6a7 into coreos:main Sep 18, 2025
5 of 6 checks passed
marmijo added a commit to coreos/fedora-coreos-pipeline that referenced this pull request Sep 19, 2025
The AWS ore wrapper relies on information from image.json. Buildfetch
the ostree artifact before creating and replicating the AWS Windows
License Included (winli) image to be consistent and use the same values
as the original AMI.

Also, remove the hack in libcloud.groovy to get around buildfetch'ing
the vmdk image since the build artifact is no longer required in the
winli build case.

See: coreos/coreos-assembler#4315
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.

2 participants