Commit 8ffbc6e
committed
e2e: only test disk0 in the Darwin end-to-end test
The Darwin end-to-end test scrapes the real macos-latest runner and diffs
the result against collector/fixtures/e2e-output-darwin.txt. We no longer
see disk4 on the nodes and that breaks the e2e tests.
This PR removes the usage of disk4 and the related fixtures:
-node_disk_read_errors_total{device="disk4"} 0
-node_disk_read_retries_total{device="disk4"} 0
-node_disk_write_errors_total{device="disk4"} 0
-node_disk_write_retries_total{device="disk4"} 0
This PR also adds a dump of the attached interfaces and disks
so we can more easily discover issues in the future.
Signed-off-by: René Treffer <treffer@measite.de>1 parent 125a020 commit 8ffbc6e
2 files changed
Lines changed: 5 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -330,11 +330,15 @@ jobs: | |||
| 330 | 330 | ||
| 331 | 331 | echo "::group::Print environment information" | |
| 332 | 332 | uname -a | |
| 333 | + sw_vers | ||
| 334 | + sysctl hw.memsize hw.ncpu | ||
| 335 | + diskutil list | ||
| 336 | + ifconfig -l | ||
| 333 | 337 | echo "GOOS: $(go env GOOS)" | |
| 334 | 338 | echo "GOARCH: $(go env GOARCH)" | |
| 335 | 339 | echo "::endgroup::" | |
| 336 | 340 | ||
| 337 | 341 | echo "::group::Run End-to-End Tests" | |
| 338 | 342 | git config --global --add safe.directory $(pwd) | |
| 339 | - make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=disk[04]' | ||
| 343 | + make test-e2e E2E_EXTRA_FLAGS='--collector.diskstats.device-include=disk0' | ||
| 340 | 344 | echo "::endgroup::" | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -94,19 +94,15 @@ node_buddyinfo_blocks{node="0",size="9",zone="Normal"} 0 | |||
| 94 | 94 | # HELP node_disk_read_errors_total The total number of read errors. | |
| 95 | 95 | # TYPE node_disk_read_errors_total counter | |
| 96 | 96 | node_disk_read_errors_total{device="disk0"} 0 | |
| 97 | - node_disk_read_errors_total{device="disk4"} 0 | ||
| 98 | 97 | # HELP node_disk_read_retries_total The total number of read retries. | |
| 99 | 98 | # TYPE node_disk_read_retries_total counter | |
| 100 | 99 | node_disk_read_retries_total{device="disk0"} 0 | |
| 101 | - node_disk_read_retries_total{device="disk4"} 0 | ||
| 102 | 100 | # HELP node_disk_write_errors_total The total number of write errors. | |
| 103 | 101 | # TYPE node_disk_write_errors_total counter | |
| 104 | 102 | node_disk_write_errors_total{device="disk0"} 0 | |
| 105 | - node_disk_write_errors_total{device="disk4"} 0 | ||
| 106 | 103 | # HELP node_disk_write_retries_total The total number of write retries. | |
| 107 | 104 | # TYPE node_disk_write_retries_total counter | |
| 108 | 105 | node_disk_write_retries_total{device="disk0"} 0 | |
| 109 | - node_disk_write_retries_total{device="disk4"} 0 | ||
| 110 | 106 | # HELP node_exporter_build_info A metric with a constant '1' value labeled by version, revision, branch, goversion from which node_exporter was built, and the goos and goarch for the build. | |
| 111 | 107 | # TYPE node_exporter_build_info gauge | |
| 112 | 108 | # HELP node_memory_swap_total_bytes Memory information field swap_total_bytes. | |
0 commit comments