diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command index b2b165b76b6..1daf6bd76e4 100644 --- a/.buildkite/hooks/pre-command +++ b/.buildkite/hooks/pre-command @@ -14,7 +14,7 @@ if [[ "${BUILDKITE_LABEL:-}" == *"Pipeline upload"* || "${BUILDKITE_LABEL:-}" == fi if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-packetbeat" && "$BUILDKITE_STEP_KEY" == *"system-tests"* ]]; then - PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(retry -t 5 -- vault kv get -field plaintext -format=json ${PRIVATE_CI_GCS_CREDENTIALS_PATH}) + PRIVATE_CI_GCS_CREDENTIALS_SECRET=$(vault kv get -field plaintext -format=json ${PRIVATE_CI_GCS_CREDENTIALS_PATH}) export PRIVATE_CI_GCS_CREDENTIALS_SECRET fi diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 0bd0c546f2e..58db6bf793e 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -207,7 +207,6 @@ steps: - label: ":windows: x-pack/packetbeat: Win 2022 System Tests" key: "mandatory-win-2022-system-tests" - skip: "skipping due to elastic/beats#38142" command: | Set-Location -Path x-pack/packetbeat mage systemTest @@ -321,7 +320,6 @@ steps: - label: ":windows: x-pack/packetbeat: Win 10 System Tests" key: "extended-win-10-system-tests" - skip: "skipping due to elastic/beats#38142" command: | Set-Location -Path x-pack/packetbeat mage systemTest diff --git a/x-pack/packetbeat/tests/system/app_test.go b/x-pack/packetbeat/tests/system/app_test.go index 214cd9c2369..22bc5967459 100644 --- a/x-pack/packetbeat/tests/system/app_test.go +++ b/x-pack/packetbeat/tests/system/app_test.go @@ -65,7 +65,26 @@ func TestDevices(t *testing.T) { } t.Log("Expect interfaces:\n", expected) +ifcsLoop: for _, ifc := range ifcs { - assert.Contains(t, stdout, ifc.Name) + if strings.Contains(stdout, ifc.Name) { + continue ifcsLoop + } + addrs, err := ifc.Addrs() + assert.NoError(t, err) + maddrs, err := ifc.MulticastAddrs() + assert.NoError(t, err) + addrs = append(addrs, maddrs...) + for _, addr := range addrs { + s := addr.String() + // remove the network mask suffix + if idx := strings.Index(s, "/"); idx > -1 { + s = s[:idx] + } + if strings.Contains(stdout, s) { + continue ifcsLoop + } + } + t.Errorf("interface %q not found", ifc.Name) } }