Repository navigation
fix: exporting one add-on no longer deletes the add-ons exported before it - #646
Conversation
Every export-*sysext recipe now calls _export-sysext-element. The k0s export no longer wipes dist/sysext/ or overwrites SHA256SUMS, and a re-export replaces its own SHA256SUMS line instead of appending a copy. The contract test checks every export recipe's prefix against its element's sysext-image and fails if a recipe re-inlines the body. Closes projectbluefin#638 Hive-Run: projectbluefin#638 Hive-Plan: architect-finding-638 Hive-Spec: sysext-export#recommendation Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Karibhou <Karibhou@users.noreply.github.com>
|
hive/awaiting-ci: CI pending — sweep will merge when green. 🐝 Hive Agent: |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Needs approval from an approver in each of these files:Approvers can indicate their approval by writing |
737e475
|
There was a problem hiding this comment.
Summary: This change preserves previously exported add-ons, but an existing automated check still expects the old export steps and now fails. Update that check to recognize the shared export steps so the fix can pass the project's tests.
What I need from you: Update the homelab export assertions as shown below.
correctness
Justfile:268-271 replaces the homelab export loop, but tests/unit/test_homelab_sysext.py:462-463 still requires that exact loop and its copy command. At head 910265dcfab452eb1103489c5279025795860be2, running python3 -m pytest -q tests/unit/test_sysext_export_contract.py tests/unit/test_homelab_sysext.py reproduces the failure at line 462: 1 failed, 40 passed. Replace both stale assertions while retaining coverage of all four add-ons:
--- a/tests/unit/test_homelab_sysext.py
+++ b/tests/unit/test_homelab_sysext.py
@@
- assert "for name in homelab argo-workflows mcp kubestellar; do" in justfile
- assert "cp dist/homelab-checkout/${name}_*.raw.zst dist/sysext/" in justfile
+ for name in ("homelab", "argo-workflows", "mcp", "kubestellar"):
+ assert f"just _export-sysext-element {name}-sysext {name}_" in justfileNo findings from: security, intent-alignment, style, docs-currency.
Confidence: 3/5 (needs attention) — 1 medium finding; 1 perspective requested changes
— hive: agent=reviewer backend=copilot model=gpt-6.1-sol copilot=1.0.88
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. Review findings from Summary: This change preserves previously exported add-ons, but an existing automated check still expects the old export steps and now fails. Update that check to recognize the shared export steps so the fix can pass the project's tests. What I need from you: Update the homelab export assertions as shown below. correctness
--- a/tests/unit/test_homelab_sysext.py
+++ b/tests/unit/test_homelab_sysext.py
@@
- assert "for name in homelab argo-workflows mcp kubestellar; do" in justfile
- assert "cp dist/homelab-checkout/${name}_*.raw.zst dist/sysext/" in justfile
+ for name in ("homelab", "argo-workflows", "mcp", "kubestellar"):
+ assert f"just _export-sysext-element {name}-sysext {name}_" in justfileNo findings from: security, intent-alignment, style, docs-currency. |
test_homelab_sysext still required the inlined export loop that the shared _export-sysext-element helper replaced. Assert the four helper calls instead, so all four add-ons stay covered. Refs projectbluefin#638 Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
|
Addressed the 00:45 review in 3dfd629: |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Needs approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@Karibhou this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (3 waiting): fixes are handed out before new work as soon as you have capacity. |
|
@Karibhou the hive has adopted this PR ( |
Danathar
left a comment
There was a problem hiding this comment.
tests/unit/test_nvidia_container_toolkit_sysext.py:208 still asserts the inline just bst artifact checkout oci/nvidia-container-toolkit-sysext.bst line, which this PR removes, so unit will fail. Please update the test to the helper call, and add a summary plus "Closes #638" to the body. This overlaps #649 and the two conflict; I'd keep this one, since it covers both halves of #638.
Assisted-by: OpenAI Codex Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Needs approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Thanks for the review. |
|
The hive adopted this PR ( Blocker: the review swarm's latest verdict on The hive would move this to |
Danathar
left a comment
There was a problem hiding this comment.
Approving. The shared helper no longer wipes dist/sysext/, which fixes the bug in #638 where exporting k0s deleted the other add-ons. A re-export now replaces its own checksum line instead of appending a duplicate. All nine export recipes call the helper, and the contract tests check that each recipe's file prefix matches its element's image name. The NVIDIA Container Toolkit test is updated and unit passes at this head. zizmor is red on every server PR (#651); #626, now in the merge queue, fixes it. This conflicts with #649, and we're keeping this one because it covers both halves of #638.
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Summary: Exporting the k0s add-on no longer deletes previously exported add-ons. A shared export helper also replaces duplicated recipes and replaces existing checksum entries on re-export.
Closes #638
The helper covers k0s, ZFS, NVIDIA, NVIDIA Container Toolkit, Tailscale, NetBird and the homelab add-ons. Contract tests check their element names and output prefixes.
Verification at
f088868: 54 focused NVIDIA, homelab and export-contract tests passed;just validatepassed the version checks and BuildStream graph resolution. The fork's hosted workflows still require maintainer authorization for a full CI verdict.— hive: backend=codex