Skip to content

fix: testsuite fixed for the release - #1629

Merged
joelmccoy merged 2 commits into
mainfrom
fix/zarf-v089-ci
Nov 3, 2026
Merged

joelmccoy merged 2 commits into
mainfrom
fix/zarf-v089-ci

Conversation

@slaskawi

@slaskawi slaskawi commented Nov 3, 2026

Copy link
Copy Markdown
Contributor

Description

Update test fixtures and preserve schema-specific SBOM files when creating bundles.

Related Issue

Relates to #1622

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

Signed-off-by: Sebastian Łaskawiec <sebastian.laskawiec@defenseunicorns.com>
@slaskawi
slaskawi requested a review from a team as a code owner November 3, 2026 08:17
Copilot AI balanced review requested due to automatic review settings November 3, 2026 08:17

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.

🟒 Approval recommended

No active review issues were identified for the Zarf v0.89 compatibility and schema-specific SBOM preservation updates.

No open issues πŸŽ‰

What changed in this PR

Restores compatibility with Zarf v0.89 following the dependency update associated with release #1622, preserving schema-specific SBOM files during Legacy bundle creation and updating test fixtures.

Changes:

  • Preserve archived SBOMs for v1alpha1 packages and individual SBOM resources for newer schemas.
  • Update Legacy test fixtures to use Zarf’s current image archive types and init-package constant.
  • Adjust beta-schema output expectations across library, CLI, and Legacy end-to-end tests.
File Description
tests/​library/​schema_test.go Update beta output expectation to omit the trailing newline.
tests/​legacy/​e2e/​bundle_test.go Align beta deployment output assertions with Zarf v0.89.
tests/​cli/​cmd/​bundle/​create_integration_test.go Update the beta deployment output expectation.
pkg/​legacy/​utils/​boci/​oci_test.go Use api.ArchiveImage in image-filtering fixtures.
pkg/​legacy/​bundler/​fetcher/​common.go Preserve SBOM files according to the package schema.
pkg/​legacy/​bundle/​inspect_test.go Use api.ArchiveImage in bundle inspection fixtures.
pkg/​legacy/​bundle/​deploy_test.go Use api.ZarfInitConfig in deployment option assertions.

Review effort: Balanced

@greptile-apps

greptile-apps Bot commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable issues remain from this review.

Summary

Preserves schema-specific SBOM files when creating legacy bundles and updates tests for the current Zarf types and template output.

  • Optional-component bundles keep SBOMs in both Zarf package layouts.
  • Release tests match current package fixtures and deployed file contents.

Reviews (2) Β· Last reviewed commit: "test: cover schema-specific SBOM filteri..." Β· Reviewed by Greptile

Comment thread pkg/legacy/bundler/fetcher/common.go Resolved
@slaskawi slaskawi changed the title fix: restore Zarf v0.89 compatibility fix: testsuite fixed for the release Nov 3, 2026
Signed-off-by: Sebastian Łaskawiec <sebastian.laskawiec@defenseunicorns.com>
@slaskawi

slaskawi commented Nov 3, 2026

Copy link
Copy Markdown
Contributor Author

Added focused file-list coverage for alpha and beta packages with and without SBOMs, including optional-component filtering.

@joelmccoy
joelmccoy merged commit 7f7b7d0 into main Nov 3, 2026
31 checks passed
@joelmccoy
joelmccoy deleted the fix/zarf-v089-ci branch November 3, 2026 17:54
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