From bf88c252f6627a596d9aa265c08352f416b174f1 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 9 May 2024 15:02:03 +0000 Subject: [PATCH] Added retries for packaging steps & K8S tests (#39466) (#39485) * added retries for packaging steps & k8s tests * added timeout for packaging steps (cherry picked from commit 75397eb0fa4140c30df0b66dd0eecf367d5925cd) Co-authored-by: Olga Naydyonock --- .buildkite/auditbeat/auditbeat-pipeline.yml | 8 ++++++++ .buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml | 12 ++++++++++++ .buildkite/filebeat/filebeat-pipeline.yml | 8 ++++++++ .buildkite/heartbeat/heartbeat-pipeline.yml | 8 ++++++++ .buildkite/metricbeat/pipeline.yml | 8 ++++++++ .buildkite/packetbeat/pipeline.packetbeat.yml | 8 ++++++++ .buildkite/winlogbeat/pipeline.winlogbeat.yml | 4 ++++ .buildkite/x-pack/pipeline.xpack.auditbeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.filebeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.metricbeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 4 ++++ .buildkite/x-pack/pipeline.xpack.packetbeat.yml | 8 ++++++++ .buildkite/x-pack/pipeline.xpack.winlogbeat.yml | 4 ++++ 15 files changed, 112 insertions(+) diff --git a/.buildkite/auditbeat/auditbeat-pipeline.yml b/.buildkite/auditbeat/auditbeat-pipeline.yml index 13e3ef2f2563..95460910e22d 100644 --- a/.buildkite/auditbeat/auditbeat-pipeline.yml +++ b/.buildkite/auditbeat/auditbeat-pipeline.yml @@ -316,6 +316,10 @@ steps: set -euo pipefail cd auditbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: gcp image: "${IMAGE_UBUNTU_X86_64}" @@ -334,6 +338,10 @@ steps: set -euo pipefail cd auditbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml b/.buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml index d8a5354b1ef7..bd1a493b8854 100644 --- a/.buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml +++ b/.buildkite/deploy/kubernetes/deploy-k8s-pipeline.yml @@ -26,6 +26,9 @@ steps: commands: - "MODULE=kubernetes make -C metricbeat integration-tests" - "make -C deploy/kubernetes test" + retry: + automatic: + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -41,6 +44,9 @@ steps: commands: - "MODULE=kubernetes make -C metricbeat integration-tests" - "make -C deploy/kubernetes test" + retry: + automatic: + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -56,6 +62,9 @@ steps: commands: - "MODULE=kubernetes make -C metricbeat integration-tests" - "make -C deploy/kubernetes test" + retry: + automatic: + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -71,6 +80,9 @@ steps: commands: - "MODULE=kubernetes make -C metricbeat integration-tests" - "make -C deploy/kubernetes test" + retry: + automatic: + - limit: 3 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 053e8dbec419..ebb25ca39664 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -269,6 +269,10 @@ steps: command: | cd filebeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -286,6 +290,10 @@ steps: command: | cd filebeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index cadbcec1eca2..54cfe6f0ac7e 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -285,6 +285,10 @@ steps: command: | cd heartbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: gcp image: "${IMAGE_UBUNTU_X86_64}" @@ -302,6 +306,10 @@ steps: command: | cd heartbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index d15212d2ef32..d0cece3a5900 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -295,6 +295,10 @@ steps: - label: ":linux: Packaging Linux" key: "packaging-linux" command: "cd metricbeat && mage package" + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -310,6 +314,10 @@ steps: - label: ":linux: Packaging ARM" key: "packaging-arm" command: "cd metricbeat && mage package" + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/packetbeat/pipeline.packetbeat.yml b/.buildkite/packetbeat/pipeline.packetbeat.yml index d510107a89c2..a0d139d303b6 100644 --- a/.buildkite/packetbeat/pipeline.packetbeat.yml +++ b/.buildkite/packetbeat/pipeline.packetbeat.yml @@ -245,6 +245,10 @@ steps: command: | cd packetbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -262,6 +266,10 @@ steps: command: | cd packetbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml index ff3327913492..b32391bd2e79 100644 --- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml +++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml @@ -160,6 +160,10 @@ steps: command: | cd winlogbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml index 80c298c725df..81c1f99ad861 100644 --- a/.buildkite/x-pack/pipeline.xpack.auditbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.auditbeat.yml @@ -258,6 +258,10 @@ steps: command: | cd x-pack/auditbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -275,6 +279,10 @@ steps: command: | cd x-pack/auditbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 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 f874f0c45e91..322caff662aa 100644 --- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml @@ -91,6 +91,10 @@ steps: command: | cd x-pack/dockerlogbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: gcp image: "${IMAGE_UBUNTU_X86_64}" @@ -108,6 +112,10 @@ steps: command: | cd x-pack/dockerlogbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index b7e71e3c3c0a..22b6432fd66c 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -332,6 +332,10 @@ steps: command: | cd x-pack/filebeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -349,6 +353,10 @@ steps: command: | cd x-pack/filebeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index 239bd033568d..a20f454b6aa2 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -255,6 +255,10 @@ steps: command: | cd x-pack/heartbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -272,6 +276,10 @@ steps: command: | cd x-pack/heartbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${AWS_IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index 4c1c31521f92..11ff663e2fd4 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -319,6 +319,10 @@ steps: command: | cd x-pack/metricbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -336,6 +340,10 @@ steps: command: | cd x-pack/metricbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 1bba268a140f..8812d680c4c7 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -228,6 +228,10 @@ steps: command: | cd x-pack/osquerybeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml index 1ab71c30d7df..451bcee84ba8 100644 --- a/.buildkite/x-pack/pipeline.xpack.packetbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.packetbeat.yml @@ -314,6 +314,10 @@ steps: command: | cd x-pack/packetbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -331,6 +335,10 @@ steps: command: | cd x-pack/packetbeat mage package + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml index c6b5a6f59fe5..a96cf4803fe1 100644 --- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml @@ -170,6 +170,10 @@ steps: - label: ":ubuntu: Packaging Linux" key: "packaging-linux" command: "cd x-pack/winlogbeat && mage package" + retry: + automatic: + - limit: 3 + timeout_in_minutes: 20 agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}"