Skip to content

WIP: fix macos functional tests github actions #22034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ComradeProgrammer wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −15
Open

WIP: fix macos functional tests github actions #22034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3730ba9
update functional test to macos 15
ComradeProgrammer Dec 4, 2025
a0f1af7
trigger all actions
ComradeProgrammer Dec 4, 2025
7da034a
continue info block
ComradeProgrammer Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions .github/workflows/functional_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ jobs:
cruntime: docker
os: ubuntu-22.04
test-timeout: 7m
- name: qemu-docker-macos-13-x86_64
- name: qemu-docker-macos-15-x86_64
driver: qemu
cruntime: docker
os: macos-13
os: macos-15
Copy link
Contributor

@nirs nirs Dec 8, 2025

Choose a reason for hiding this comment

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

This is already handled in #22027
But the author is not responsive. Maybe you can take the correct changes to this commit.

extra-start-args: --network socket_vmnet
test-timeout: 50m
- name: vfkit-docker-macos-13-x86_64
- name: vfkit-docker-macos-15-x86_64
driver: vfkit
cruntime: docker
os: macos-13
os: macos-15
extra-start-args: --network vmnet-shared
test-timeout: 50m
steps:
Expand All @@ -106,6 +106,7 @@ jobs:
shell: bash
run: |
set -x
set +e
Copy link
Contributor

@nirs nirs Dec 8, 2025

Choose a reason for hiding this comment

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

Since we set the shell to "bash" and not "bash -e", this should not be needed, since -e is not the default.

echo "=== Kernel and OS ==="
uname -a
sw_vers
Expand Down Expand Up @@ -258,8 +259,8 @@ jobs:
curl https://get.docker.com | sudo sh
dockerd-rootless-setuptool.sh install -f
docker context use rootless
- name: Ensure bootpd is enabled (macos-13)
if: matrix.os == 'macos-13'
- name: Ensure bootpd is enabled (macos-15)
if: matrix.os == 'macos-15'
shell: bash
run: |
set -x
Expand Down Expand Up @@ -369,12 +370,12 @@ jobs:
fi
kubectl version --client=true
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: matrix.os == 'macos-15' && matrix.driver == 'qemu'
run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
- name: Install vfkit and vmnet_helper (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'vfkit'
if: matrix.os == 'macos-15' && matrix.driver == 'vfkit'
run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/smoke-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
matrix:
include:
- driver: qemu
os: macos-13
os: macos-15
network_flag: --network socket_vmnet
- driver: vfkit
os: macos-13
os: macos-15
network_flag: --network vmnet-shared
- driver: docker
os: ubuntu-24.04
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
- name: Build Binaries
run: make
- name: Ensure bootpd is enabled (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15'
shell: bash
run: |
set -x
Expand All @@ -103,18 +103,18 @@ jobs:
sudo $fw --add /usr/libexec/bootpd
sudo $fw --unblock /usr/libexec/bootpd
- name: Update brew (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15'
run: brew update
- name: Install tools (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15'
run: brew install tree
- name: Install vfkit and vmnet-helper (macos)
if: matrix.driver == 'vfkit'
run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: matrix.os == 'macos-15' && matrix.driver == 'qemu'
run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,6 @@ _update-all:
@(cd hack && go run update/update_all/update_all.go)



Copy link
Contributor

@nirs nirs Dec 8, 2025

Choose a reason for hiding this comment

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

Removing this line triggers all actions?

# targets for tests on prow
include ./hack/prow/prow.mk

Loading