From 257c305060d60f80b81c6907f6b3717f45fbf335 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Fri, 10 May 2024 18:28:24 +0200 Subject: [PATCH 1/4] Fixed pipelines formatting (#39513) (cherry picked from commit 5bff7ec4edd6448d863258bf33346f9223f95566) # Conflicts: # .buildkite/packetbeat/pipeline.packetbeat.yml # .buildkite/winlogbeat/pipeline.winlogbeat.yml # .buildkite/x-pack/pipeline.xpack.heartbeat.yml # .buildkite/x-pack/pipeline.xpack.libbeat.yml # .buildkite/x-pack/pipeline.xpack.osquerybeat.yml # .buildkite/x-pack/pipeline.xpack.packetbeat.yml # .buildkite/x-pack/pipeline.xpack.winlogbeat.yml --- .buildkite/auditbeat/auditbeat-pipeline.yml | 26 +-- .buildkite/filebeat/filebeat-pipeline.yml | 22 +-- .buildkite/heartbeat/heartbeat-pipeline.yml | 28 +-- .buildkite/libbeat/pipeline.libbeat.yml | 12 +- .buildkite/metricbeat/pipeline.yml | 23 ++- .buildkite/packetbeat/pipeline.packetbeat.yml | 80 +++++++- .buildkite/winlogbeat/pipeline.winlogbeat.yml | 34 +++- .../x-pack/pipeline.xpack.auditbeat.yml | 20 +- .../x-pack/pipeline.xpack.dockerlogbeat.yml | 4 +- .buildkite/x-pack/pipeline.xpack.filebeat.yml | 22 +-- .../x-pack/pipeline.xpack.heartbeat.yml | 110 ++++++++++- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 120 +++++++++++- .../x-pack/pipeline.xpack.metricbeat.yml | 20 +- .../x-pack/pipeline.xpack.osquerybeat.yml | 80 +++++++- .../x-pack/pipeline.xpack.packetbeat.yml | 177 +++++++++++++++++- .../x-pack/pipeline.xpack.winlogbeat.yml | 35 +++- 16 files changed, 686 insertions(+), 127 deletions(-) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index 9a28c40b0dc..1d31d229d58 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -34,7 +34,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -53,7 +53,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_RHEL9}" @@ -71,7 +71,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -91,7 +91,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -112,7 +112,7 @@ steps: GOX_FLAGS: "-arch amd64" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -135,7 +135,7 @@ steps: mage build integTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -156,7 +156,7 @@ steps: mage build integTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" @@ -177,7 +177,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" @@ -198,7 +198,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -218,7 +218,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" @@ -241,7 +241,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -262,7 +262,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -283,7 +283,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 70df2d140b6..182828a9abe 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -32,7 +32,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -50,7 +50,7 @@ steps: mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -68,7 +68,7 @@ steps: mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: gcp image: "${IMAGE_UBUNTU_X86_64}" @@ -87,7 +87,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -108,7 +108,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -135,7 +135,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -156,7 +156,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" @@ -175,7 +175,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" @@ -198,7 +198,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -219,7 +219,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -240,7 +240,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index aabe42c2f11..f120af79a19 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -32,7 +32,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -50,7 +50,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_RHEL9}" @@ -69,7 +69,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -89,7 +89,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -103,12 +103,12 @@ steps: context: "Heartbeat: Win-2022 Unit Tests" - label: ":ubuntu: Heartbeat Go Integration Tests" - command: | + command: | cd heartbeat mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -126,7 +126,7 @@ steps: mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -150,7 +150,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" @@ -174,7 +174,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -194,7 +194,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" @@ -212,12 +212,12 @@ steps: steps: - label: ":windows: Heartbeat Win-2019 Unit Tests" key: "heartbeat-win-extended-2019" - command: | + command: | Set-Location -Path heartbeat mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -237,7 +237,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -257,7 +257,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml index d1c56ae86da..5bc0c179d9e 100644 --- a/.buildkite/libbeat/pipeline.libbeat.yml +++ b/.buildkite/libbeat/pipeline.libbeat.yml @@ -23,7 +23,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -43,7 +43,7 @@ steps: mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -63,7 +63,7 @@ steps: mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -83,7 +83,7 @@ steps: make crosscompile retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -103,7 +103,7 @@ steps: make STRESS_TEST_OPTIONS='-timeout=20m -race -v -parallel 1' GOTEST_OUTPUT_OPTIONS=' | go-junit-report > libbeat-stress-test.xml' stress-tests retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -125,7 +125,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index be37e855a83..725da6b9567 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -34,7 +34,7 @@ steps: command: "cd metricbeat && mage build unitTest" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -71,7 +71,7 @@ steps: cd metricbeat && mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -104,7 +104,7 @@ steps: cd metricbeat && mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -121,7 +121,7 @@ steps: command: "make -C metricbeat crosscompile" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -140,7 +140,7 @@ steps: key: "mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -161,7 +161,7 @@ steps: key: "mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -186,7 +186,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -207,7 +207,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -228,7 +228,7 @@ steps: key: "extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -254,7 +254,7 @@ steps: cd metricbeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -274,7 +274,7 @@ steps: cd metricbeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" @@ -285,7 +285,6 @@ steps: - github_commit_status: context: "metricbeat: Extended MacOS arm64 Unit Tests" - - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index c59d8649370..0b340361d6f 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -30,7 +30,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -65,7 +65,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -90,7 +90,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -110,7 +110,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -130,7 +130,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -151,7 +151,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -165,6 +165,30 @@ steps: - github_commit_status: context: "packetbeat: Extended Windows 11 Unit Tests" +<<<<<<< HEAD +======= + - label: ":windows: Windows 2019 Unit Tests" + command: | + Set-Location -Path packetbeat + mage build unitTest + key: "extended-win-2019-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2019}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "packetbeat/build/*.xml" + - "packetbeat/build/*.json" + notify: + - github_commit_status: + context: "packetbeat: Extended Windows 2019 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "Extended Tests" key: "extended-tests" steps: @@ -178,7 +202,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -189,6 +213,48 @@ steps: - github_commit_status: context: "packetbeat: Extended MacOS x86_64 Unit Tests" +<<<<<<< HEAD +======= + - label: ":mac: MacOS arm64 Unit Tests" + key: "macos-arm64-unit-tests-extended" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/ + command: | + set -euo pipefail + source .buildkite/scripts/install_macos_tools.sh + cd packetbeat + mage build unitTest + retry: + automatic: + - limit: 3 + agents: + provider: "orka" + imagePrefix: "${IMAGE_MACOS_ARM}" + artifact_paths: + - "packetbeat/build/*.xml" + - "packetbeat/build/*.json" + notify: + - github_commit_status: + context: "packetbeat: Extended MacOS arm64 Unit Tests" + + - label: ":linux: Ubuntu ARM Unit Tests" + key: "linux-arm64-unit-tests-extended" + command: "cd packetbeat && mage build unitTest" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + retry: + automatic: + - limit: 3 + agents: + provider: "aws" + imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" + instanceType: "${AWS_ARM_INSTANCE_TYPE}" + artifact_paths: + - "packetbeat/build/*.xml" + - "packetbeat/build/*.json" + notify: + - github_commit_status: + context: "packetbeat: Extended Ubuntu ARM Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index 6a38932e2bd..2c025f6937f 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -26,7 +26,7 @@ steps: command: "make -C winlogbeat crosscompile" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -38,6 +38,30 @@ steps: - github_commit_status: context: "Winlogbeat: Crosscompile" +<<<<<<< HEAD +======= + - label: ":windows: Winlogbeat Win-2016 Unit Tests" + command: | + Set-Location -Path winlogbeat + mage build unitTest + key: "mandatory-win-2016-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2016}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "winlogbeat/build/*.xml" + - "winlogbeat/build/*.json" + notify: + - github_commit_status: + context: "Winlogbeat: Win-2016 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: Winlogbeat Win-2019 Unit Tests" command: | Set-Location -Path winlogbeat @@ -45,7 +69,7 @@ steps: key: "mandatory-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -66,7 +90,7 @@ steps: key: "mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -92,7 +116,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -113,7 +137,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 18020c7d358..35b141761db 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -38,7 +38,7 @@ steps: mage update build test retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -57,7 +57,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_RHEL9_X86_64}" @@ -76,7 +76,7 @@ steps: key: "mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -97,7 +97,7 @@ steps: key: "mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -122,7 +122,7 @@ steps: key: "extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -143,7 +143,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -164,7 +164,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -190,7 +190,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -209,7 +209,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" @@ -230,7 +230,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml index f45cbf486cf..5eac20b77f4 100644 --- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml @@ -33,7 +33,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -59,7 +59,7 @@ steps: MODULE: $MODULE retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index 9f3b76c574e..78407d89a84 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -32,7 +32,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -55,7 +55,7 @@ steps: cd x-pack/filebeat && mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -78,7 +78,7 @@ steps: cd x-pack/filebeat && mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -97,7 +97,7 @@ steps: key: "x-pack-filebeat-mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -118,7 +118,7 @@ steps: key: "x-pack-filebeat-mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -139,7 +139,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" @@ -162,7 +162,7 @@ steps: key: "x-pack-filebeat-extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -183,7 +183,7 @@ steps: key: "x-pack-filebeat-extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -204,7 +204,7 @@ steps: key: "x-pack-filebeat-extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -229,7 +229,7 @@ steps: cd x-pack/filebeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -249,7 +249,7 @@ steps: cd x-pack/filebeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 9c77c101b6a..cde1ed41cb2 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -41,7 +41,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -64,7 +64,7 @@ steps: mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -126,6 +126,38 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2016 Unit Tests" +<<<<<<< HEAD +======= + # Doesn't exist in Jenkins + - label: ":windows: x-pack/heartbeat Windows 2022 Unit Tests" + key: "mandatory-win-2022-unit-tests" + skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" + command: | + Set-Location -Path x-pack/heartbeat + mage build unitTest + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2022}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/heartbeat/build/*.xml" + - "x-pack/heartbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/heartbeat: Windows 2022 Unit Tests" + + - group: "x-pack/heartbeat Extended Windows Tests" + key: "x-pack-heartbeat-extended-win-tests" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ + skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" + + steps: +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: x-pack/heartbeat Windows 10 Unit Tests" command: | Set-Location -Path x-pack/heartbeat @@ -133,7 +165,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -147,6 +179,52 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 10 Unit Tests" +<<<<<<< HEAD +======= + # Doesn't exist in Jenkins + - label: ":windows: x-pack/heartbeat Windows 11 Unit Tests" + command: | + Set-Location -Path x-pack/heartbeat + mage build test + key: "extended-win-11-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_11}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/heartbeat/build/*.xml" + - "x-pack/heartbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/heartbeat: Windows 11 Unit Tests" + + - label: ":windows: x-pack/heartbeat Windows 2019 Unit Tests" + command: | + Set-Location -Path x-pack/heartbeat + mage build test + retry: + automatic: + - limit: 3 + key: "extended-win-2019-unit-tests" + agents: + provider: "gcp" + image: "${IMAGE_WIN_2019}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/heartbeat/build/*.xml" + - "x-pack/heartbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/heartbeat: Windows 2019 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/heartbeat macOS Extended Tests" key: "x-pack-heartbeat-extended-tests-macos" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ @@ -162,7 +240,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -173,6 +251,30 @@ steps: - github_commit_status: context: "x-pack/heartbeat: macOS x86_64 Extended Tests" +<<<<<<< HEAD +======= + - label: ":mac: x-pack/heartbeat macOS arm64 Unit Tests" + command: | + set -euo pipefail + source .buildkite/scripts/install_macos_tools.sh + withNodeJSEnv $ASDF_NODEJS_VERSION + installNodeJsDependencies + cd x-pack/heartbeat + mage build unitTest + retry: + automatic: + - limit: 3 + agents: + provider: "orka" + imagePrefix: "${IMAGE_MACOS_ARM}" + artifact_paths: + - "x-pack/heartbeat/build/*.xml" + - "x-pack/heartbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/heartbeat: macOS arm64 Extended Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 21aa1e40349..9a11a4bee36 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -22,7 +22,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -41,7 +41,7 @@ steps: mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -60,7 +60,7 @@ steps: mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -72,6 +72,118 @@ steps: - github_commit_status: context: "x-pack/libbeat: Python Integration Tests" +<<<<<<< HEAD +======= + - label: ":windows: Windows 2016 Unit Tests" + command: | + Set-Location -Path x-pack/libbeat + mage -w reader\etw build goUnitTest + key: "mandatory-win-2016-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2016}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/libbeat/build/*.xml" + - "x-pack/libbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/libbeat: Windows 2016 Unit Tests" + + - label: ":windows: Windows 2022 Unit Tests" + command: | + Set-Location -Path x-pack/libbeat + mage -w reader\etw build goUnitTest + key: "mandatory-win-2022-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2022}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/libbeat/build/*.xml" + - "x-pack/libbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/libbeat: Windows 2022 Unit Tests" + + - group: "x-pack/libbeat Extended Windows Tests" + key: "x-pack-libbeat-extended-win-tests" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ + steps: + - label: ":windows: Windows 10 Unit Tests" + command: | + Set-Location -Path x-pack/libbeat + mage -w reader\etw build goUnitTest + key: "extended-win-10-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_10}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/libbeat/build/*.xml" + - "x-pack/libbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/libbeat: Windows 10 Unit Tests" + + - label: ":windows: Windows 11 Unit Tests" + command: | + Set-Location -Path x-pack/libbeat + mage -w reader\etw build goUnitTest + key: "extended-win-11-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_11}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/libbeat/build/*.xml" + - "x-pack/libbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/libbeat: Windows 11 Unit Tests" + + - label: ":windows: Windows 2019 Unit Tests" + command: | + Set-Location -Path x-pack/libbeat + mage -w reader\etw build goUnitTest + key: "extended-win-2019-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2019}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/libbeat/build/*.xml" + - "x-pack/libbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/libbeat: Windows 2019 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/libbeat Linux arm Extended Tests" key: "x-pack-libbeat-extended-tests-linux-arm" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ @@ -83,7 +195,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index 267dbc8460e..71d875284d3 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -32,7 +32,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -55,7 +55,7 @@ steps: cd x-pack/metricbeat && mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -78,7 +78,7 @@ steps: cd x-pack/metricbeat && mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -97,7 +97,7 @@ steps: key: "mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -118,7 +118,7 @@ steps: key: "mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -143,7 +143,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -164,7 +164,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -185,7 +185,7 @@ steps: key: "extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -211,7 +211,7 @@ steps: cd x-pack/metricbeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -231,7 +231,7 @@ steps: cd x-pack/metricbeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_ARM}" diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 156cfdb753b..6fe1460a0d2 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -32,7 +32,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -51,7 +51,7 @@ steps: mage goIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -70,7 +70,7 @@ steps: key: "mandatory-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -82,7 +82,32 @@ steps: - "x-pack/osquerybeat/build/*.json" notify: - github_commit_status: +<<<<<<< HEAD context: "x-pack/osquerybeat: Windows 2019 Unit Tests" +======= + context: "x-pack/osquerybeat: Windows 2016 Unit Tests" + + - label: ":windows: Windows 2022 Unit Tests" + command: | + Set-Location -Path x-pack/osquerybeat + mage build unitTest + key: "mandatory-win-2022-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2022}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/osquerybeat/build/*.xml" + - "x-pack/osquerybeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/osquerybeat: Windows 2022 Unit Tests" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) # windows-2022 wasn't defined in Jenkins (mandatory or extended) hence not migrated -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L36-L70 - group: "x-pack/osquerybeat Extended Windows Tests" @@ -96,7 +121,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -110,7 +135,30 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: Windows 10 Unit Tests" +<<<<<<< HEAD # Windows 11 wasn't defined in Jenkins, hence not migrating -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L50-L53 +======= + - label: ":windows: Windows 11 Unit Tests" + command: | + Set-Location -Path x-pack/osquerybeat + mage build unitTest + key: "extended-win-11-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_11}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/osquerybeat/build/*.xml" + - "x-pack/osquerybeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/osquerybeat: Windows 11 Unit Tests" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) # contrary to other projects Windows 2016 is defined as extended for 7.17 -> https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L40-L44 - label: ":windows: Windows 2016 Unit Tests" @@ -120,7 +168,7 @@ steps: key: "extended-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -145,7 +193,7 @@ steps: cd x-pack/osquerybeat && mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -156,7 +204,27 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: MacOS x86_64 Unit Tests" +<<<<<<< HEAD # macOS arm64 is not tested on 7.17 see https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L22-L34 +======= + - label: ":mac: MacOS arm64 Unit Tests" + command: | + set -euo pipefail + source .buildkite/scripts/install_macos_tools.sh + cd x-pack/osquerybeat && mage build unitTest + retry: + automatic: + - limit: 3 + agents: + provider: "orka" + imagePrefix: "${IMAGE_MACOS_ARM}" + artifact_paths: + - "x-pack/osquerybeat/build/*.xml" + - "x-pack/osquerybeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/osquerybeat: MacOS arm64 Unit Tests" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 6b6dccfe08b..856156fee6c 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -27,7 +27,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -39,15 +39,39 @@ steps: - github_commit_status: context: "x-pack/packetbeat: Ubuntu Unit Tests" +<<<<<<< HEAD - label: ":linux: Ubuntu ARM Unit Tests" key: "extended-arm64-unit-test" +======= + - label: ":linux: Ubuntu System Tests" + key: "mandatory-linux-system-test" + command: | + cd x-pack/packetbeat + mage systemTest + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_UBUNTU_X86_64}" + machineType: "${GCP_DEFAULT_MACHINE_TYPE}" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Ubuntu System Tests" + + - label: ":rhel: RHEL9 Unit Tests" + key: "mandatory-rhel9-unit-test" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) command: | cd x-pack/packetbeat mage build unitTest if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" @@ -66,10 +90,57 @@ steps: key: "extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" +<<<<<<< HEAD image: "${IMAGE_WIN_2019}" +======= + image: "${IMAGE_WIN_2016}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Windows 2016 Unit Tests" + + - label: ":windows: Windows 2022 Unit Tests" + command: | + Set-Location -Path x-pack/packetbeat + mage build unitTest + key: "mandatory-win-2022-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2022}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Windows 2022 Unit Tests" + + - label: ":windows: Windows 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 + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2022}" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) machineType: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 disk_type: "pd-ssd" @@ -91,7 +162,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -112,7 +183,7 @@ steps: key: "mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" @@ -124,7 +195,78 @@ steps: - "x-pack/packetbeat/build/*.json" notify: - github_commit_status: +<<<<<<< HEAD context: "x-pack/packetbeat: Windows 2016 Unit Tests" +======= + context: "x-pack/packetbeat: Windows 11 Unit Tests" + + - label: ":windows: Windows 2019 Unit Tests" + command: | + Set-Location -Path x-pack/packetbeat + mage build unitTest + key: "extended-win-2019-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2019}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Windows 2019 Unit Tests" + + - label: ":windows: Windows 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 + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_10}" + machineType: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Windows 2022 System Tests" + + - group: "x-pack/packetbeat Linux arm Extended Tests" + key: "x-pack-packetbeat-extended-linux-arm-tests" + if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + steps: + - label: ":linux: Ubuntu ARM Unit Tests" + key: "extended-arm64-unit-test" + command: | + cd x-pack/packetbeat + mage build unitTest + if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ + retry: + automatic: + - limit: 3 + agents: + provider: "aws" + imagePrefix: "${IMAGE_UBUNTU_ARM_64}" + instanceType: "${AWS_ARM_INSTANCE_TYPE}" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: Ubuntu ARM Unit Tests" +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/packetbeat MacOS Extended Tests" key: "x-pack-packetbeat-extended-macos-tests" @@ -139,7 +281,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "orka" imagePrefix: "${IMAGE_MACOS_X86_64}" @@ -150,6 +292,29 @@ steps: - github_commit_status: context: "x-pack/packetbeat: MacOS Unit Tests" +<<<<<<< HEAD +======= + - label: ":mac: MacOS arm64 Unit Tests" + key: "macos-arm64-unit-tests-extended" + command: | + set -euo pipefail + source .buildkite/scripts/install_macos_tools.sh + cd x-pack/packetbeat + mage build unitTest + retry: + automatic: + - limit: 3 + agents: + provider: "orka" + imagePrefix: "${IMAGE_MACOS_ARM}" + artifact_paths: + - "x-pack/packetbeat/build/*.xml" + - "x-pack/packetbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/packetbeat: MacOS arm64 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/packetbeat Packaging" key: "x-pack-packetbeat-packaging" if: build.env("BUILDKITE_PULL_REQUEST") != "false" diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml index e54e12cfe95..f1980f44fae 100644 --- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml @@ -19,7 +19,6 @@ steps: - group: "x-pack/Winlogbeat Mandatory Tests" key: "x-pack-winlogbeat-mandatory-tests" steps: - - label: ":windows: x-pack/Winlogbeat Win-2019 Unit (MODULE) Tests" key: "mandatory-win-2019-module-unit-tests" command: | @@ -32,7 +31,7 @@ steps: MODULE: $MODULE retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" @@ -46,6 +45,30 @@ steps: - github_commit_status: context: "x-pack/Winlogbeat Win-2019 Unit (MODULE) Tests" +<<<<<<< HEAD +======= + - label: ":windows: x-pack/Winlogbeat Win-2016 Unit Tests" + command: | + Set-Location -Path x-pack/winlogbeat + mage build unitTest + key: "mandatory-win-2016-unit-tests" + retry: + automatic: + - limit: 3 + agents: + provider: "gcp" + image: "${IMAGE_WIN_2016}" + machine_type: "${GCP_WIN_MACHINE_TYPE}" + disk_size: 100 + disk_type: "pd-ssd" + artifact_paths: + - "x-pack/winlogbeat/build/*.xml" + - "x-pack/winlogbeat/build/*.json" + notify: + - github_commit_status: + context: "x-pack/Winlogbeat Win-2016 Unit Tests" + +>>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: x-pack/Winlogbeat Win-2022 Unit Tests" command: | Set-Location -Path x-pack/winlogbeat @@ -53,7 +76,7 @@ steps: key: "mandatory-win-2022-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2022}" @@ -97,7 +120,7 @@ steps: key: "extended-win-10-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_10}" @@ -118,7 +141,7 @@ steps: key: "extended-win-11-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_11}" @@ -139,7 +162,7 @@ steps: key: "extended-win-2019-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2019}" From 0880665d534523c94555ffaeb00b48e42f5cf49e Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Thu, 16 May 2024 16:22:19 +0200 Subject: [PATCH 2/4] Merged --- .buildkite/packetbeat/pipeline.packetbeat.yml | 9 +-------- .buildkite/winlogbeat/pipeline.winlogbeat.yml | 5 +---- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 9 --------- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 3 --- .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 12 ------------ .buildkite/x-pack/pipeline.xpack.packetbeat.yml | 16 ---------------- .buildkite/x-pack/pipeline.xpack.winlogbeat.yml | 3 --- 7 files changed, 2 insertions(+), 55 deletions(-) diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index 0b340361d6f..4979d73e3d2 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -47,7 +47,7 @@ steps: command: "cd packetbeat && mage build unitTest" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" @@ -79,7 +79,6 @@ steps: - github_commit_status: context: "packetbeat: Windows 2019 Unit Tests" - - group: "Extended Windows Tests" key: "packetbeat-extended-windows-tests" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ @@ -165,8 +164,6 @@ steps: - github_commit_status: context: "packetbeat: Extended Windows 11 Unit Tests" -<<<<<<< HEAD -======= - label: ":windows: Windows 2019 Unit Tests" command: | Set-Location -Path packetbeat @@ -188,7 +185,6 @@ steps: - github_commit_status: context: "packetbeat: Extended Windows 2019 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "Extended Tests" key: "extended-tests" steps: @@ -213,8 +209,6 @@ steps: - github_commit_status: context: "packetbeat: Extended MacOS x86_64 Unit Tests" -<<<<<<< HEAD -======= - label: ":mac: MacOS arm64 Unit Tests" key: "macos-arm64-unit-tests-extended" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*(macOS|arm).*/ @@ -254,7 +248,6 @@ steps: - github_commit_status: context: "packetbeat: Extended Ubuntu ARM Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index 2c025f6937f..303b2c9ba5e 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -38,8 +38,6 @@ steps: - github_commit_status: context: "Winlogbeat: Crosscompile" -<<<<<<< HEAD -======= - label: ":windows: Winlogbeat Win-2016 Unit Tests" command: | Set-Location -Path winlogbeat @@ -61,7 +59,6 @@ steps: - github_commit_status: context: "Winlogbeat: Win-2016 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: Winlogbeat Win-2019 Unit Tests" command: | Set-Location -Path winlogbeat @@ -158,7 +155,7 @@ steps: key: "mandatory-win-2016-unit-tests" retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_WIN_2016}" diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index cde1ed41cb2..95e3833f005 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -126,8 +126,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2016 Unit Tests" -<<<<<<< HEAD -======= # Doesn't exist in Jenkins - label: ":windows: x-pack/heartbeat Windows 2022 Unit Tests" key: "mandatory-win-2022-unit-tests" @@ -157,7 +155,6 @@ steps: skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" steps: ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: x-pack/heartbeat Windows 10 Unit Tests" command: | Set-Location -Path x-pack/heartbeat @@ -179,8 +176,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 10 Unit Tests" -<<<<<<< HEAD -======= # Doesn't exist in Jenkins - label: ":windows: x-pack/heartbeat Windows 11 Unit Tests" command: | @@ -224,7 +219,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2019 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/heartbeat macOS Extended Tests" key: "x-pack-heartbeat-extended-tests-macos" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ @@ -251,8 +245,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: macOS x86_64 Extended Tests" -<<<<<<< HEAD -======= - label: ":mac: x-pack/heartbeat macOS arm64 Unit Tests" command: | set -euo pipefail @@ -274,7 +266,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: macOS arm64 Extended Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 9a11a4bee36..12d700856ab 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -72,8 +72,6 @@ steps: - github_commit_status: context: "x-pack/libbeat: Python Integration Tests" -<<<<<<< HEAD -======= - label: ":windows: Windows 2016 Unit Tests" command: | Set-Location -Path x-pack/libbeat @@ -183,7 +181,6 @@ steps: - github_commit_status: context: "x-pack/libbeat: Windows 2019 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/libbeat Linux arm Extended Tests" key: "x-pack-libbeat-extended-tests-linux-arm" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 6fe1460a0d2..6bf096301d4 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -82,9 +82,6 @@ steps: - "x-pack/osquerybeat/build/*.json" notify: - github_commit_status: -<<<<<<< HEAD - context: "x-pack/osquerybeat: Windows 2019 Unit Tests" -======= context: "x-pack/osquerybeat: Windows 2016 Unit Tests" - label: ":windows: Windows 2022 Unit Tests" @@ -107,7 +104,6 @@ steps: notify: - github_commit_status: context: "x-pack/osquerybeat: Windows 2022 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) # windows-2022 wasn't defined in Jenkins (mandatory or extended) hence not migrated -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L36-L70 - group: "x-pack/osquerybeat Extended Windows Tests" @@ -135,9 +131,6 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: Windows 10 Unit Tests" -<<<<<<< HEAD - # Windows 11 wasn't defined in Jenkins, hence not migrating -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L50-L53 -======= - label: ":windows: Windows 11 Unit Tests" command: | Set-Location -Path x-pack/osquerybeat @@ -158,7 +151,6 @@ steps: notify: - github_commit_status: context: "x-pack/osquerybeat: Windows 11 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) # contrary to other projects Windows 2016 is defined as extended for 7.17 -> https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L40-L44 - label: ":windows: Windows 2016 Unit Tests" @@ -204,9 +196,6 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: MacOS x86_64 Unit Tests" -<<<<<<< HEAD - # macOS arm64 is not tested on 7.17 see https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L22-L34 -======= - label: ":mac: MacOS arm64 Unit Tests" command: | set -euo pipefail @@ -224,7 +213,6 @@ steps: notify: - github_commit_status: context: "x-pack/osquerybeat: MacOS arm64 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 856156fee6c..1c5cc3052a8 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -39,10 +39,6 @@ steps: - github_commit_status: context: "x-pack/packetbeat: Ubuntu Unit Tests" -<<<<<<< HEAD - - label: ":linux: Ubuntu ARM Unit Tests" - key: "extended-arm64-unit-test" -======= - label: ":linux: Ubuntu System Tests" key: "mandatory-linux-system-test" command: | @@ -64,7 +60,6 @@ steps: - label: ":rhel: RHEL9 Unit Tests" key: "mandatory-rhel9-unit-test" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) command: | cd x-pack/packetbeat mage build unitTest @@ -93,9 +88,6 @@ steps: - limit: 3 agents: provider: "gcp" -<<<<<<< HEAD - image: "${IMAGE_WIN_2019}" -======= image: "${IMAGE_WIN_2016}" machine_type: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 @@ -140,7 +132,6 @@ steps: agents: provider: "gcp" image: "${IMAGE_WIN_2022}" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) machineType: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 disk_type: "pd-ssd" @@ -195,9 +186,6 @@ steps: - "x-pack/packetbeat/build/*.json" notify: - github_commit_status: -<<<<<<< HEAD - context: "x-pack/packetbeat: Windows 2016 Unit Tests" -======= context: "x-pack/packetbeat: Windows 11 Unit Tests" - label: ":windows: Windows 2019 Unit Tests" @@ -266,7 +254,6 @@ steps: notify: - github_commit_status: context: "x-pack/packetbeat: Ubuntu ARM Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/packetbeat MacOS Extended Tests" key: "x-pack-packetbeat-extended-macos-tests" @@ -292,8 +279,6 @@ steps: - github_commit_status: context: "x-pack/packetbeat: MacOS Unit Tests" -<<<<<<< HEAD -======= - label: ":mac: MacOS arm64 Unit Tests" key: "macos-arm64-unit-tests-extended" command: | @@ -314,7 +299,6 @@ steps: - github_commit_status: context: "x-pack/packetbeat: MacOS arm64 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - group: "x-pack/packetbeat Packaging" key: "x-pack-packetbeat-packaging" if: build.env("BUILDKITE_PULL_REQUEST") != "false" diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml index f1980f44fae..1489a32fc34 100644 --- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml @@ -45,8 +45,6 @@ steps: - github_commit_status: context: "x-pack/Winlogbeat Win-2019 Unit (MODULE) Tests" -<<<<<<< HEAD -======= - label: ":windows: x-pack/Winlogbeat Win-2016 Unit Tests" command: | Set-Location -Path x-pack/winlogbeat @@ -68,7 +66,6 @@ steps: - github_commit_status: context: "x-pack/Winlogbeat Win-2016 Unit Tests" ->>>>>>> 5bff7ec4ed (Fixed pipelines formatting (#39513)) - label: ":windows: x-pack/Winlogbeat Win-2022 Unit Tests" command: | Set-Location -Path x-pack/winlogbeat From ac7d84ce8f6ff7299c89e101768204556f0b627e Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Thu, 16 May 2024 16:35:14 +0200 Subject: [PATCH 3/4] merged --- .buildkite/auditbeat/auditbeat-pipeline.yml | 51 +----- .buildkite/packetbeat/pipeline.packetbeat.yml | 21 --- .buildkite/winlogbeat/pipeline.winlogbeat.yml | 21 --- .../x-pack/pipeline.xpack.heartbeat.yml | 93 ----------- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 109 ------------ .../x-pack/pipeline.xpack.osquerybeat.yml | 62 +------ .../x-pack/pipeline.xpack.packetbeat.yml | 157 +----------------- .../x-pack/pipeline.xpack.winlogbeat.yml | 21 --- 8 files changed, 7 insertions(+), 528 deletions(-) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index a84e8e95745..66e8ec49b69 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -56,7 +56,7 @@ steps: mage build unitTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -81,7 +81,7 @@ steps: mage pythonIntegTest retry: automatic: - - limit: 3 + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -154,29 +154,6 @@ steps: - github_commit_status: context: "auditbeat: macOS x86_64 Unit Tests" -<<<<<<< HEAD - - label: ":mac: Auditbeat macOS arm64 ARM Unit Tests" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - cd auditbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "auditbeat/build/*.xml" - - "auditbeat/build/*.json" - notify: - - github_commit_status: - context: "auditbeat: macOS arm64 Unit Tests" - -======= ->>>>>>> 3122641aabb8a25a6b256a478089eef3a893c318 - group: "Auditbeat Windows Extended Testing" key: "auditbeat-extended-tests-win" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ @@ -224,30 +201,6 @@ steps: - github_commit_status: context: "auditbeat: Extended Windows 10 Unit Tests" -<<<<<<< HEAD - - label: ":windows: Auditbeat Win-11 Unit Tests" - key: "auditbeat-extended-win-11-unit-tests" - command: | - Set-Location -Path auditbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_11}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "auditbeat/build/*.xml" - - "auditbeat/build/*.json" - notify: - - github_commit_status: - context: "auditbeat: Extended Windows 11 Unit Tests" - -======= ->>>>>>> 3122641aabb8a25a6b256a478089eef3a893c318 - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index b86fea44d82..9438fdee87c 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -168,27 +168,6 @@ steps: - github_commit_status: context: "packetbeat: Extended Windows 11 Unit Tests" - - label: ":windows: Windows 2019 Unit Tests" - command: | - Set-Location -Path packetbeat - mage build unitTest - key: "extended-win-2019-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2019}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "packetbeat/build/*.xml" - - "packetbeat/build/*.json" - notify: - - github_commit_status: - context: "packetbeat: Extended Windows 2019 Unit Tests" - - group: "Extended Tests" key: "extended-tests" steps: diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index a357a423e77..857593cce88 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -44,27 +44,6 @@ steps: - github_commit_status: context: "Winlogbeat: Crosscompile" - - label: ":windows: Winlogbeat Win-2016 Unit Tests" - command: | - Set-Location -Path winlogbeat - mage build unitTest - key: "mandatory-win-2016-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2016}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "winlogbeat/build/*.xml" - - "winlogbeat/build/*.json" - notify: - - github_commit_status: - context: "Winlogbeat: Win-2016 Unit Tests" - - label: ":windows: Winlogbeat Win-2019 Unit Tests" command: | Set-Location -Path winlogbeat diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 3cf8d26e5cd..9399a601add 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -130,35 +130,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 2016 Unit Tests" - # Doesn't exist in Jenkins - - label: ":windows: x-pack/heartbeat Windows 2022 Unit Tests" - key: "mandatory-win-2022-unit-tests" - skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" - command: | - Set-Location -Path x-pack/heartbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/heartbeat/build/*.xml" - - "x-pack/heartbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/heartbeat: Windows 2022 Unit Tests" - - - group: "x-pack/heartbeat Extended Windows Tests" - key: "x-pack-heartbeat-extended-win-tests" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ - skip: "skipping due to elastic/beats#23957 and elastic/beats#23958" - - steps: - label: ":windows: x-pack/heartbeat Windows 10 Unit Tests" command: | Set-Location -Path x-pack/heartbeat @@ -180,49 +151,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: Windows 10 Unit Tests" - # Doesn't exist in Jenkins - - label: ":windows: x-pack/heartbeat Windows 11 Unit Tests" - command: | - Set-Location -Path x-pack/heartbeat - mage build test - key: "extended-win-11-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_11}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/heartbeat/build/*.xml" - - "x-pack/heartbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/heartbeat: Windows 11 Unit Tests" - - - label: ":windows: x-pack/heartbeat Windows 2019 Unit Tests" - command: | - Set-Location -Path x-pack/heartbeat - mage build test - retry: - automatic: - - limit: 3 - key: "extended-win-2019-unit-tests" - agents: - provider: "gcp" - image: "${IMAGE_WIN_2019}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/heartbeat/build/*.xml" - - "x-pack/heartbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/heartbeat: Windows 2019 Unit Tests" - - group: "x-pack/heartbeat macOS Extended Tests" key: "x-pack-heartbeat-extended-tests-macos" if: build.env("GITHUB_PR_LABELS") =~ /.*macOS.*/ @@ -249,27 +177,6 @@ steps: - github_commit_status: context: "x-pack/heartbeat: macOS x86_64 Extended Tests" - - label: ":mac: x-pack/heartbeat macOS arm64 Unit Tests" - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - withNodeJSEnv $ASDF_NODEJS_VERSION - installNodeJsDependencies - cd x-pack/heartbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "x-pack/heartbeat/build/*.xml" - - "x-pack/heartbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/heartbeat: macOS arm64 Extended Tests" - - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 461cfff6eec..800b102a3e4 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -76,115 +76,6 @@ steps: - github_commit_status: context: "x-pack/libbeat: Python Integration Tests" - - label: ":windows: Windows 2016 Unit Tests" - command: | - Set-Location -Path x-pack/libbeat - mage -w reader\etw build goUnitTest - key: "mandatory-win-2016-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2016}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/libbeat/build/*.xml" - - "x-pack/libbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/libbeat: Windows 2016 Unit Tests" - - - label: ":windows: Windows 2022 Unit Tests" - command: | - Set-Location -Path x-pack/libbeat - mage -w reader\etw build goUnitTest - key: "mandatory-win-2022-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/libbeat/build/*.xml" - - "x-pack/libbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/libbeat: Windows 2022 Unit Tests" - - - group: "x-pack/libbeat Extended Windows Tests" - key: "x-pack-libbeat-extended-win-tests" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*[Ww]indows.*/ - steps: - - label: ":windows: Windows 10 Unit Tests" - command: | - Set-Location -Path x-pack/libbeat - mage -w reader\etw build goUnitTest - key: "extended-win-10-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_10}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/libbeat/build/*.xml" - - "x-pack/libbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/libbeat: Windows 10 Unit Tests" - - - label: ":windows: Windows 11 Unit Tests" - command: | - Set-Location -Path x-pack/libbeat - mage -w reader\etw build goUnitTest - key: "extended-win-11-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_11}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/libbeat/build/*.xml" - - "x-pack/libbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/libbeat: Windows 11 Unit Tests" - - - label: ":windows: Windows 2019 Unit Tests" - command: | - Set-Location -Path x-pack/libbeat - mage -w reader\etw build goUnitTest - key: "extended-win-2019-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2019}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/libbeat/build/*.xml" - - "x-pack/libbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/libbeat: Windows 2019 Unit Tests" - - group: "x-pack/libbeat Linux arm Extended Tests" key: "x-pack-libbeat-extended-tests-linux-arm" if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index be971665337..0687bb16375 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -85,28 +85,7 @@ steps: - "x-pack/osquerybeat/build/*.json" notify: - github_commit_status: - context: "x-pack/osquerybeat: Windows 2016 Unit Tests" - - - label: ":windows: Windows 2022 Unit Tests" - command: | - Set-Location -Path x-pack/osquerybeat - mage build unitTest - key: "mandatory-win-2022-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/osquerybeat/build/*.xml" - - "x-pack/osquerybeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/osquerybeat: Windows 2022 Unit Tests" + context: "x-pack/osquerybeat: Windows 2019 Unit Tests" # windows-2022 wasn't defined in Jenkins (mandatory or extended) hence not migrated -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L36-L70 - group: "x-pack/osquerybeat Extended Windows Tests" @@ -134,27 +113,6 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: Windows 10 Unit Tests" - - label: ":windows: Windows 11 Unit Tests" - command: | - Set-Location -Path x-pack/osquerybeat - mage build unitTest - key: "extended-win-11-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_11}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/osquerybeat/build/*.xml" - - "x-pack/osquerybeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/osquerybeat: Windows 11 Unit Tests" - # contrary to other projects Windows 2016 is defined as extended for 7.17 -> https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L40-L44 - label: ":windows: Windows 2016 Unit Tests" command: | @@ -199,24 +157,6 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: MacOS x86_64 Unit Tests" - - label: ":mac: MacOS arm64 Unit Tests" - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - cd x-pack/osquerybeat && mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "x-pack/osquerybeat/build/*.xml" - - "x-pack/osquerybeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/osquerybeat: MacOS arm64 Unit Tests" - - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 331bb30bacd..1ada2e550e6 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -43,27 +43,8 @@ steps: - github_commit_status: context: "x-pack/packetbeat: Ubuntu Unit Tests" - - label: ":linux: Ubuntu System Tests" - key: "mandatory-linux-system-test" - command: | - cd x-pack/packetbeat - mage systemTest - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_UBUNTU_X86_64}" - machineType: "${GCP_DEFAULT_MACHINE_TYPE}" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Ubuntu System Tests" - - - label: ":rhel: RHEL9 Unit Tests" - key: "mandatory-rhel9-unit-test" + - label: ":linux: Ubuntu ARM Unit Tests" + key: "extended-arm64-unit-test" command: | cd x-pack/packetbeat mage build unitTest @@ -92,50 +73,7 @@ steps: - limit: 3 agents: provider: "gcp" - image: "${IMAGE_WIN_2016}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Windows 2016 Unit Tests" - - - label: ":windows: Windows 2022 Unit Tests" - command: | - Set-Location -Path x-pack/packetbeat - mage build unitTest - key: "mandatory-win-2022-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Windows 2022 Unit Tests" - - - label: ":windows: Windows 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 - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2022}" + image: "${IMAGE_WIN_2019}" machineType: "${GCP_WIN_MACHINE_TYPE}" disk_size: 100 disk_type: "pd-ssd" @@ -190,74 +128,7 @@ steps: - "x-pack/packetbeat/build/*.json" notify: - github_commit_status: - context: "x-pack/packetbeat: Windows 11 Unit Tests" - - - label: ":windows: Windows 2019 Unit Tests" - command: | - Set-Location -Path x-pack/packetbeat - mage build unitTest - key: "extended-win-2019-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2019}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Windows 2019 Unit Tests" - - - label: ":windows: Windows 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 - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_10}" - machineType: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Windows 2022 System Tests" - - - group: "x-pack/packetbeat Linux arm Extended Tests" - key: "x-pack-packetbeat-extended-linux-arm-tests" - if: build.env("BUILDKITE_PULL_REQUEST") == "false" || build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ - steps: - - label: ":linux: Ubuntu ARM Unit Tests" - key: "extended-arm64-unit-test" - command: | - cd x-pack/packetbeat - mage build unitTest - if: build.env("GITHUB_PR_LABELS") =~ /.*arm.*/ - retry: - automatic: - - limit: 3 - agents: - provider: "aws" - imagePrefix: "${IMAGE_UBUNTU_ARM_64}" - instanceType: "${AWS_ARM_INSTANCE_TYPE}" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: Ubuntu ARM Unit Tests" + context: "x-pack/packetbeat: Windows 2016 Unit Tests" - group: "x-pack/packetbeat MacOS Extended Tests" key: "x-pack-packetbeat-extended-macos-tests" @@ -283,26 +154,6 @@ steps: - github_commit_status: context: "x-pack/packetbeat: MacOS Unit Tests" - - label: ":mac: MacOS arm64 Unit Tests" - key: "macos-arm64-unit-tests-extended" - command: | - set -euo pipefail - source .buildkite/scripts/install_macos_tools.sh - cd x-pack/packetbeat - mage build unitTest - retry: - automatic: - - limit: 3 - agents: - provider: "orka" - imagePrefix: "${IMAGE_MACOS_ARM}" - artifact_paths: - - "x-pack/packetbeat/build/*.xml" - - "x-pack/packetbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/packetbeat: MacOS arm64 Unit Tests" - - group: "x-pack/packetbeat Packaging" key: "x-pack-packetbeat-packaging" if: build.env("BUILDKITE_PULL_REQUEST") != "false" diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml index c73698344b5..068ac73e1f5 100644 --- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml @@ -47,27 +47,6 @@ steps: - github_commit_status: context: "x-pack/Winlogbeat Win-2019 Unit (MODULE) Tests" - - label: ":windows: x-pack/Winlogbeat Win-2016 Unit Tests" - command: | - Set-Location -Path x-pack/winlogbeat - mage build unitTest - key: "mandatory-win-2016-unit-tests" - retry: - automatic: - - limit: 3 - agents: - provider: "gcp" - image: "${IMAGE_WIN_2016}" - machine_type: "${GCP_WIN_MACHINE_TYPE}" - disk_size: 100 - disk_type: "pd-ssd" - artifact_paths: - - "x-pack/winlogbeat/build/*.xml" - - "x-pack/winlogbeat/build/*.json" - notify: - - github_commit_status: - context: "x-pack/Winlogbeat Win-2016 Unit Tests" - - label: ":windows: x-pack/Winlogbeat Win-2022 Unit Tests" command: | Set-Location -Path x-pack/winlogbeat From 2e8722129f598c087f78f212c453015682d6e8c1 Mon Sep 17 00:00:00 2001 From: Pavel Zorin Date: Thu, 16 May 2024 16:38:31 +0200 Subject: [PATCH 4/4] merged --- .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 0687bb16375..5d4e376e989 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -113,6 +113,8 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: Windows 10 Unit Tests" + # Windows 11 wasn't defined in Jenkins, hence not migrating -> https://github.com/elastic/beats/blob/f021699c4bc9a494d255eb339c819c2745eb87f8/x-pack/osquerybeat/Jenkinsfile.yml#L50-L53 + # contrary to other projects Windows 2016 is defined as extended for 7.17 -> https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L40-L44 - label: ":windows: Windows 2016 Unit Tests" command: | @@ -157,6 +159,8 @@ steps: - github_commit_status: context: "x-pack/osquerybeat: MacOS x86_64 Unit Tests" + # macOS arm64 is not tested on 7.17 see https://github.com/elastic/beats/blob/ec9d1ccb50b947ed7d6c49d2e17a2cd611a251a9/x-pack/osquerybeat/Jenkinsfile.yml#L22-L34 + - wait: ~ # with PRs, we want to run packaging only if mandatory tests succeed # for other cases, e.g. merge commits, we want to run packaging (and publish) independently of other tests