From 666c44627e62bc4bbdd6409b8aa16bce7b99f19d Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 17 Jun 2024 15:22:31 -0400 Subject: [PATCH] [7.17] Fix Kubernetes module metricbeat Go integration tests (#39928) * Always use mage -v goIntegTest * Switch to batch/v1 for CronJobs. --- .buildkite/filebeat/filebeat-pipeline.yml | 2 +- .buildkite/heartbeat/heartbeat-pipeline.yml | 2 +- .buildkite/libbeat/pipeline.libbeat.yml | 2 +- .buildkite/metricbeat/pipeline.yml | 2 +- .buildkite/scripts/go_int_tests.sh | 2 +- .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.filebeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.heartbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.libbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.metricbeat.yml | 2 +- .buildkite/x-pack/pipeline.xpack.osquerybeat.yml | 2 +- metricbeat/module/kubernetes/kubernetes.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index cf1f07175bf0..5a0dcc9e0a34 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -92,7 +92,7 @@ steps: - label: ":ubuntu: Filebeat Go Integration Tests" command: | cd filebeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/heartbeat/heartbeat-pipeline.yml b/.buildkite/heartbeat/heartbeat-pipeline.yml index 5c1d1af7113a..b0bd67b036ac 100644 --- a/.buildkite/heartbeat/heartbeat-pipeline.yml +++ b/.buildkite/heartbeat/heartbeat-pipeline.yml @@ -96,7 +96,7 @@ steps: echo "~~~ Running tests" cd heartbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/libbeat/pipeline.libbeat.yml b/.buildkite/libbeat/pipeline.libbeat.yml index 3d3247b9da98..9cff63eefca9 100644 --- a/.buildkite/libbeat/pipeline.libbeat.yml +++ b/.buildkite/libbeat/pipeline.libbeat.yml @@ -72,7 +72,7 @@ steps: command: | set -euo pipefail cd libbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 975d2b62f12b..86c0a59a704e 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -61,7 +61,7 @@ steps: echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" cd metricbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/scripts/go_int_tests.sh b/.buildkite/scripts/go_int_tests.sh index b4c519f45126..0a5d6b0efacd 100755 --- a/.buildkite/scripts/go_int_tests.sh +++ b/.buildkite/scripts/go_int_tests.sh @@ -7,6 +7,6 @@ set -euo pipefail echo "--- Run Go Intergration Tests for $BEATS_PROJECT_NAME" pushd "${BEATS_PROJECT_NAME}" > /dev/null -mage goIntegTest +mage -v goIntegTest popd > /dev/null diff --git a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml index 5fd432e282e7..c74ff8773a7f 100644 --- a/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml @@ -49,7 +49,7 @@ steps: defineModuleFromTheChangeSet x-pack/dockerlogbeat echo "~~~ Running tests" cd x-pack/dockerlogbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml index c0b8bc048b3c..4daa38c7d867 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -94,7 +94,7 @@ steps: key: "x-pack-filebeat-mandatory-int-test" command: | cd x-pack/filebeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml index dca98f61909c..959caebebcc9 100644 --- a/.buildkite/x-pack/pipeline.xpack.heartbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.heartbeat.yml @@ -65,7 +65,7 @@ steps: npm install -g @elastic/synthetics echo "~~~ Running tests" cd x-pack/heartbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.libbeat.yml b/.buildkite/x-pack/pipeline.xpack.libbeat.yml index 6cb1825b7a1e..58b13925627e 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -72,7 +72,7 @@ steps: key: "mandatory-int-test" command: | cd x-pack/libbeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml index 2dc75406a9d2..a68ba388b43e 100644 --- a/.buildkite/x-pack/pipeline.xpack.metricbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.metricbeat.yml @@ -56,7 +56,7 @@ steps: source .buildkite/scripts/changesets.sh defineModuleFromTheChangeSet x-pack/metricbeat echo "~~~ Running tests" - cd x-pack/metricbeat && mage goIntegTest + cd x-pack/metricbeat && mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml index 5ce7755c7900..05f4765e5c76 100644 --- a/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.osquerybeat.yml @@ -47,7 +47,7 @@ steps: key: "mandatory-int-test" command: | cd x-pack/osquerybeat - mage goIntegTest + mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/metricbeat/module/kubernetes/kubernetes.yml b/metricbeat/module/kubernetes/kubernetes.yml index d87cb4f5f9bc..7c4ffb58ae98 100644 --- a/metricbeat/module/kubernetes/kubernetes.yml +++ b/metricbeat/module/kubernetes/kubernetes.yml @@ -108,7 +108,7 @@ spec: requests: storage: 1Mi --- -apiVersion: batch/v1beta1 +apiVersion: batch/v1 kind: CronJob metadata: name: basic-cronjob