Skip to content

acl COSI files do not contain ospackages#707

Merged
bfjelds merged 2 commits into
mainfrom
user/bfjelds/acl-no-ospackages
Jul 13, 2026
Merged

acl COSI files do not contain ospackages#707
bfjelds merged 2 commits into
mainfrom
user/bfjelds/acl-no-ospackages

Conversation

@bfjelds

@bfjelds bfjelds commented Jul 13, 2026

Copy link
Copy Markdown
Member

🔍 Description

IC 1.5 converts ACL vhds into COSI files that do not contain os_packages. Adjust Trident validation accordingly.

Trident Validation: https://dev.azure.com/mariner-org/ECF/_build/results?buildId=1158550&view=results
ACL Validation: https://dev.azure.com/mariner-org/ACL/_build/results?buildId=1158559&view=results

@bfjelds
bfjelds requested a review from a team as a code owner July 13, 2026 01:40
Copilot AI review requested due to automatic review settings July 13, 2026 01:40
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
There may be pipelines that require an authorized user to comment /azp run to run.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Adjusts Trident’s COSI v1.1 metadata validation to allow Azure Container Linux (ACL) COSI files that omit osPackages, aligning validation with IC 1.5’s ACL VHD-to-COSI conversion behavior.

Changes:

  • Updates v1.1 validation logic to treat missing osPackages as valid for ACL, while keeping per-package release/arch checks when present.
  • Preserves the existing “osPackages required” validation for non-ACL variants.

Comment thread crates/trident/src/osimage/cosi/validation.rs Outdated
Comment thread crates/trident/src/osimage/cosi/validation.rs
Compare variant_id against osutils::osrelease::AZURE_CONTAINER_LINUX_VARIANT_ID instead of a hard-coded, allocated string, and add a regression test covering Azure Container Linux images that omit osPackages.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings July 13, 2026 18:44

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

Comment thread crates/trident/src/osimage/cosi/validation.rs
@bfjelds
bfjelds merged commit ddfa09d into main Jul 13, 2026
97 checks passed
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.

4 participants