Merge branch '7.17' into update-version-next-7.17.23

elastic · Jun 14, 2024 · 6c8c132 · 6c8c132
2 parents e51f37b + e214cf4
commit 6c8c132
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 29 deletions.
diff --git a/.buildkite/filebeat/filebeat-pipeline.yml b/.buildkite/filebeat/filebeat-pipeline.yml
@@ -24,6 +24,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "Filebeat Check/Update"
+    key: "filebeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C filebeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.3"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "filebeat: check/update"
+
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "filebeat-check-update"
+
   - group: "Filebeat Mandatory Tests"
     key: "filebeat-mandatory-tests"
     steps:

diff --git a/.buildkite/x-pack/pipeline.xpack.filebeat.yml b/.buildkite/x-pack/pipeline.xpack.filebeat.yml
@@ -24,6 +24,33 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/filebeat Check/Update"
+    key: "x-pack-filebeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/filebeat check update
+          make check-no-changes
+        retry:
+          automatic:
+            - limit: 3
+        agents:
+          image: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:0.3"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack-filebeat: check/update"
+
+  - wait: ~
+    # with PRs, we want to run mandatory tests only if check/update step succeed
+    # for other cases, e.g. merge commits, we want to run mundatory test (and publish) independently of other tests
+    # this allows building DRA artifacts even if there is flakiness in check/update step
+    if: build.env("BUILDKITE_PULL_REQUEST") != "false"
+    depends_on: "x-pack-filebeat-check-update"
+
+
   - group: "x-pack/filebeat Mandatory Tests"
     key: "x-pack-filebeat-mandatory-tests"
 

diff --git a/.github/workflows/check-filebeat.yml b/.github/workflows/check-filebeat.yml