Skip to content

Fix Darwin/MacOS end-to-end test #3475

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

Merged
merged 1 commit into from
Nov 9, 2025
Merged

Fix Darwin/MacOS end-to-end test #3475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .github/workflows/bsd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ jobs:
echo "::endgroup::"

test_macos:
name: Run end-to-end tests on macOS
name: Run end-to-end tests on Darwin/MacOS
runs-on: macos-latest
steps:
- name: Checkout the repository
Expand Down Expand Up @@ -308,5 +308,5 @@ jobs:

echo "::group::Run End-to-End Tests"
git config --global --add safe.directory $(pwd)
make test-e2e
make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=disk[04]'
echo "::endgroup::"
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ include Makefile.common
PROMTOOL_VERSION ?= 2.30.0
PROMTOOL_URL ?= https://github.com/prometheus/prometheus/releases/download/v$(PROMTOOL_VERSION)/prometheus-$(PROMTOOL_VERSION).$(GO_BUILD_PLATFORM).tar.gz
PROMTOOL ?= $(FIRST_GOPATH)/bin/promtool
E2E_EXTRA_FLAGS ?=

DOCKER_IMAGE_NAME ?= node-exporter
MACH ?= $(shell uname -m)
Expand Down Expand Up @@ -121,7 +122,7 @@ tools:
.PHONY: test-e2e
test-e2e: build collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked tools
@echo ">> running end-to-end tests"
./end-to-end-test.sh
./end-to-end-test.sh -e "$(E2E_EXTRA_FLAGS)"

.PHONY: skip-test-e2e
skip-test-e2e:
Expand Down
8 changes: 6 additions & 2 deletions end-to-end-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,13 @@ case "${arch}" in
;;
esac

keep=0; update=0; verbose=0
while getopts 'hkuv' opt
extra_flags=""; keep=0; update=0; verbose=0
while getopts 'e:hkuv' opt
do
case "$opt" in
e)
extra_flags="${OPTARG}"
;;
k)
keep=1
;;
Expand Down Expand Up @@ -158,6 +161,7 @@ then
fi

collector_flags=$(cat << FLAGS
${extra_flags}
${cpu_info_collector}
--collector.arp.device-exclude=nope
--collector.bcache.priorityStats
Expand Down
Loading