From 17f3bd34702b8ef33e2646580acbfd06919e396b Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 17 Jun 2024 11:37:29 -0400 Subject: [PATCH 1/2] Always use mage -v goIntegTest --- .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 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml index 52e9a1d087c..c89d05fb16e 100644 --- a/.buildkite/filebeat/filebeat-pipeline.yml +++ b/.buildkite/filebeat/filebeat-pipeline.yml @@ -66,7 +66,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 5c1d1af7113..b0bd67b036a 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 91c93716aab..5795b965151 100644 --- a/.buildkite/libbeat/pipeline.libbeat.yml +++ b/.buildkite/libbeat/pipeline.libbeat.yml @@ -46,7 +46,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 98a18c3bfdb..e8e47f32717 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -69,7 +69,7 @@ steps: echo "~~~ Running tests" # uncomment line below (which causes skipping of module kubeconfig) when https://github.com/elastic/beats/issues/38874 has been resolved. # export KUBECONFIG="$$PWD/kubecfg" - cd metricbeat && mage goIntegTest + cd metricbeat && mage -v goIntegTest retry: automatic: - limit: 3 diff --git a/.buildkite/scripts/go_int_tests.sh b/.buildkite/scripts/go_int_tests.sh index b4c519f4512..0a5d6b0efac 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 5fd432e282e..c74ff8773a7 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 33350aee200..c49173ba399 100644 --- a/.buildkite/x-pack/pipeline.xpack.filebeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.filebeat.yml @@ -67,7 +67,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 dca98f61909..959caebebcc 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 e48433b0e05..1d32c24325d 100644 --- a/.buildkite/x-pack/pipeline.xpack.libbeat.yml +++ b/.buildkite/x-pack/pipeline.xpack.libbeat.yml @@ -46,7 +46,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 2dc75406a9d..a68ba388b43 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 5ce7755c790..05f4765e5c7 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 From 94fa0efc5492e9718acdb937b185791d90c8749a Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Mon, 17 Jun 2024 12:38:16 -0400 Subject: [PATCH 2/2] Switch to batch/v1 for CronJobs. --- metricbeat/module/kubernetes/kubernetes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metricbeat/module/kubernetes/kubernetes.yml b/metricbeat/module/kubernetes/kubernetes.yml index d87cb4f5f9b..7c4ffb58ae9 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