From f17e0828f1de9f1a256d3f520324fa6da53daee5 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 16:51:25 +0200 Subject: [PATCH] added macos steps to concurrency groups (#41616) (#41631) (cherry picked from commit 552f00cc4ae831dfba4462aa935e4695a71e2267) Co-authored-by: Olga Naydyonock --- .buildkite/auditbeat/auditbeat-pipeline.yml | 11 +++++++++++ .buildkite/filebeat/filebeat-pipeline.yml | 11 +++++++++++ .buildkite/heartbeat/heartbeat-pipeline.yml | 11 +++++++++++ .buildkite/metricbeat/pipeline.yml | 11 +++++++++++ .buildkite/packetbeat/pipeline.packetbeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.auditbeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.filebeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.metricbeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 11 +++++++++++ .buildkite/x-pack/pipeline.xpack.packetbeat.yml | 11 +++++++++++ 11 files changed, 121 insertions(+) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index d11f067c481..bacea37c1d8 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -28,6 +28,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "auditbeat-check-update" @@ -238,6 +243,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd auditbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -258,6 +266,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd auditbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 2c9fe05b3b2..13f79cd0419 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -31,6 +31,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "filebeat-check-update" @@ -185,6 +190,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd filebeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -206,6 +214,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd filebeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index abdc8f73e33..13b0c8035b4 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -29,6 +29,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "heartbeat-check-update" @@ -217,6 +222,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd heartbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -238,6 +246,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd heartbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 72aafd5faf3..fab2c734cee 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -34,6 +34,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "metricbeat-check-update" @@ -278,6 +283,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd metricbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -300,6 +308,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd metricbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index 3237644dfab..fe36831cfc4 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -28,6 +28,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "packetbeat-check-update" @@ -226,6 +231,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd packetbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -247,6 +255,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd packetbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 7cebeab4787..18d2702d231 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -31,6 +31,11 @@ env: # Module tests BEAT_PATH: "x-pack/auditbeat" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-auditbeat-check-update" @@ -234,6 +239,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/auditbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -254,6 +262,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/auditbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index 57b15927d61..20087debbee 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -27,6 +27,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-filebeat-check-update" @@ -269,6 +274,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/filebeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -289,6 +297,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/filebeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 414eeb06e75..e719f0107df 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -32,6 +32,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-heartbeat-check-update" @@ -244,6 +249,9 @@ steps: installNodeJsDependencies cd x-pack/heartbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -265,6 +273,9 @@ steps: installNodeJsDependencies cd x-pack/heartbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index e616dd05389..d37278f65fa 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -30,6 +30,11 @@ env: # Module tests BEAT_PATH: "x-pack/metricbeat" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-metricbeat-check-update" @@ -254,6 +259,9 @@ steps: set -euo pipefail source .buildkite/scripts/install_macos_tools.sh cd x-pack/metricbeat && mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -275,6 +283,9 @@ steps: set -euo pipefail source .buildkite/scripts/install_macos_tools.sh cd x-pack/metricbeat && mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 9c397f95d79..c06f473c000 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -24,6 +24,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-osquerybeat-check-update" @@ -225,6 +230,9 @@ steps: set -euo pipefail source .buildkite/scripts/install_macos_tools.sh cd x-pack/osquerybeat && mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -243,6 +251,9 @@ steps: set -euo pipefail source .buildkite/scripts/install_macos_tools.sh cd x-pack/osquerybeat && mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index abf9950b927..a6b95485403 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -28,6 +28,11 @@ env: RACE_DETECTOR: "true" TEST_COVERAGE: "true" + # Concurrency definition + CONCURRENCY_GROUP: "orka-concurrency-group" + CONCURRENCY_COUNT: 10 + CONCURRENCY_METHOD: eager + steps: - group: "Check/Update" key: "x-pack-packetbeat-check-update" @@ -315,6 +320,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/packetbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -336,6 +344,9 @@ steps: source .buildkite/scripts/install_macos_tools.sh cd x-pack/packetbeat mage build unitTest + concurrency_group: "${CONCURRENCY_GROUP}" + concurrency: "${CONCURRENCY_COUNT}" + concurrency_method: "${CONCURRENCY_METHOD}" retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability