diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 542fee787c15..bc19d82a35a6 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -132,7 +132,7 @@ steps: - label: ":windows: x-pack/packetbeat Win-2022 System Tests" key: "mandatory-win-2022-system-tests" - skip: "skipping due to elastic/beats#38142" +# skip: "skipping due to elastic/beats#38142" command: | Set-Location -Path x-pack/packetbeat mage systemTest @@ -222,7 +222,7 @@ steps: - label: ":windows: x-pack/packetbeat Win 10 System Tests" key: "extended-win-10-system-tests" - skip: "skipping due to elastic/beats#38142" +# skip: "skipping due to elastic/beats#38142" command: | Set-Location -Path x-pack/packetbeat mage systemTest diff --git a/x-pack/packetbeat/magefile.go b/x-pack/packetbeat/magefile.go index 357e5e235855..fed876ebe5aa 100644 --- a/x-pack/packetbeat/magefile.go +++ b/x-pack/packetbeat/magefile.go @@ -172,13 +172,6 @@ func SystemTest(ctx context.Context) error { return devtools.GoTest(ctx, args) } -func getBucketName() string { - if os.Getenv("BUILDKITE") == "true" { - return "ingest-buildkite-ci" - } - return "obs-ci-cache" -} - // getNpcapInstaller gets the installer from the Google Cloud Storage service. // // On Windows platforms, if getNpcapInstaller is invoked with the environment variables @@ -191,6 +184,9 @@ func getNpcapInstaller() error { if runtime.GOOS != "windows" { return nil } + if runtime.GOOS == "windows" && os.Getenv("BUILDKITE") == "true" { + return nil + } if os.Getenv("CI") != "true" && os.Getenv("NPCAP_LOCAL") != "true" { return errors.New("only available if running in the CI or with NPCAP_LOCAL=true") } @@ -205,8 +201,7 @@ func getNpcapInstaller() error { return err } } - ciBucketName := getBucketName() fmt.Printf("getting %s from private cache\n", installer) - return sh.RunV("gsutil", "cp", "gs://"+ciBucketName+"/private/"+installer, dstPath) + return sh.RunV("gsutil", "cp", "gs://obs-ci-cache/private/"+installer, dstPath) } diff --git a/x-pack/packetbeat/tests/system/app_test.go b/x-pack/packetbeat/tests/system/app_test.go index 214cd9c2369a..9ae656975727 100644 --- a/x-pack/packetbeat/tests/system/app_test.go +++ b/x-pack/packetbeat/tests/system/app_test.go @@ -64,6 +64,7 @@ func TestDevices(t *testing.T) { expected = append(expected, fmt.Sprintf("%d:%s:%s", ifc.Index, ifc.Name, ifc.Flags)) } t.Log("Expect interfaces:\n", expected) + t.Log("Actual interfaces:\n", stdout) for _, ifc := range ifcs { assert.Contains(t, stdout, ifc.Name)