Skip to content

eve-k: fix pillar 'make test' for macOS M-series (ZARCH=arm64 HV=k)#5846

Open
andrewd-zededa wants to merge 1 commit intolf-edge:masterfrom
andrewd-zededa:eve-k-macos-pillar-make-test
Open

eve-k: fix pillar 'make test' for macOS M-series (ZARCH=arm64 HV=k)#5846
andrewd-zededa wants to merge 1 commit intolf-edge:masterfrom
andrewd-zededa:eve-k-macos-pillar-make-test

Conversation

@andrewd-zededa
Copy link
Copy Markdown
Contributor

@andrewd-zededa andrewd-zededa commented Apr 22, 2026

Description

GNU Make 3.81 (macOS) selects pattern rules by first-match, so pillar-%
wins over %-cache-export-docker-load for the target pillar-cache-export-
docker-load. Add an explicit rule to the top-level Makefile that beats
all pattern rules in every Make version.

Pass --build-yml to linuxkit in pkg/pillar/Makefile so HV=k selects
build-k.yml instead of the default build.yml, and fix the test tag
from kubevirt to k.

PR dependencies

None

How to test and validate this PR

  • cd pkg/pillar
  • make ZARCH=arm64 HV=k test
  • Completion of go tests should be seen: eg.DONE 553 tests, 15 skipped in 374.852s

Changelog notes

Fix pillar make test for m series Mac, HV=k ZARCH=arm64

PR Backports

  • 16.0-stable: Unsure
  • 14.5-stable: No, as the feature is not available there.
  • 13.4-stable: No, as the feature is not available there.

Checklist

  • I've provided a proper description
  • I've added the proper documentation
  • I've tested my PR on amd64 device
  • I've tested my PR on arm64 device
  • I've written the test verification instructions
  • I've set the proper labels to this PR

And the last but not least:

  • I've checked the boxes above, or I've provided a good reason why I didn't
    check them.

Please, check the boxes above after submitting the PR in interactive mode.

@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

The Darwin bypass in build-docker-test-dependencies is not the best, working to remove it.

@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch 3 times, most recently from eac8749 to f2f95cc Compare April 22, 2026 23:49
@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

Ok, Darwin bypass removed, top level makefile target comment updated to show macOS make motivated issue

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 23, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 20.93%. Comparing base (6c49cea) to head (337549d).
⚠️ Report is 5 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5846      +/-   ##
==========================================
- Coverage   21.70%   20.93%   -0.77%     
==========================================
  Files         465      496      +31     
  Lines       84035    91400    +7365     
==========================================
+ Hits        18237    19134     +897     
- Misses      64265    70537    +6272     
- Partials     1533     1729     +196     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch from f2f95cc to 5ec76aa Compare April 23, 2026 01:12
@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

Rebased on master

Comment thread pkg/pillar/Makefile Outdated
@andrewd-zededa andrewd-zededa marked this pull request as draft April 23, 2026 15:51
@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch from 5ec76aa to 3bef59f Compare April 23, 2026 16:10
@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch from 3bef59f to 5c34c87 Compare May 5, 2026 18:10
@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

rebased on recent master

@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch from 5c34c87 to c463c8c Compare May 7, 2026 19:30
@andrewd-zededa andrewd-zededa changed the title build(pillar): fix make test on macOS M-series with HV=k eve-k: fix pillar 'make test' for macOS M-series (ZARCH=arm64 HV=k) May 7, 2026
@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

@rene I've scaled back the scope of this PR to only resolve the macOS M-series non-cross compile ZARCH=arm64 HV=k go tests.

@andrewd-zededa andrewd-zededa marked this pull request as ready for review May 7, 2026 19:42
@andrewd-zededa andrewd-zededa requested a review from rene May 7, 2026 19:48
GNU Make 3.81 (macOS) selects pattern rules by first-match, so pillar-%
wins over %-cache-export-docker-load for the target pillar-cache-export-
docker-load. Add an explicit rule to the top-level Makefile that beats
all pattern rules in every Make version.

Pass --build-yml to linuxkit in pkg/pillar/Makefile so HV=k selects
build-k.yml instead of the default build.yml, and fix the test tag
from kubevirt to k.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Andrew Durbin <andrewd@zededa.com>
@andrewd-zededa andrewd-zededa force-pushed the eve-k-macos-pillar-make-test branch from c463c8c to 337549d Compare May 7, 2026 19:51
@andrewd-zededa
Copy link
Copy Markdown
Contributor Author

rebased on latest master

Copy link
Copy Markdown
Contributor

@rene rene left a comment

Choose a reason for hiding this comment

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

LGTM

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