From 9e2ef861d608d9299985a87569229207dc4a3bd3 Mon Sep 17 00:00:00 2001
From: ev1yehor <146825775+ev1yehor@users.noreply.github.com>
Date: Thu, 13 Jun 2024 00:44:25 +0300
Subject: [PATCH] Update (#39879)

---
 .buildkite/winlogbeat/pipeline.winlogbeat.yml | 26 +++++++++++++++++
 .../x-pack/pipeline.xpack.winlogbeat.yml      | 26 +++++++++++++++++
 .github/workflows/check-winlogbeat.yml        | 28 -------------------
 3 files changed, 52 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/check-winlogbeat.yml

diff --git a/.buildkite/winlogbeat/pipeline.winlogbeat.yml b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
index c598224438fe..4d8e468595d9 100644
--- a/.buildkite/winlogbeat/pipeline.winlogbeat.yml
+++ b/.buildkite/winlogbeat/pipeline.winlogbeat.yml
@@ -23,6 +23,32 @@ env:
   DOCKER_PULL: 0
 
 steps:
+  - group: "Winlogbeat Check/Update"
+    key: "winlogbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C winlogbeat 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:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "winlogbeat: 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: "winlogbeat-check-update"
+
   - group: "Winlogbeat Mandatory Tests"
     key: "winlogbeat-mandatory-tests"
 
diff --git a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
index 401517960aa2..fc8ce29a407c 100644
--- a/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
+++ b/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
@@ -19,6 +19,32 @@ env:
   TEST_COVERAGE: "true"
 
 steps:
+  - group: "x-pack/winlogbeat Check/Update"
+    key: "x-pack-winlogbeat-check-update"
+    steps:
+      - label: "Run check/update"
+        command: |
+          make -C x-pack/winlogbeat 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:latest"
+          cpu: "4000m"
+          memory: "8Gi"
+          useCustomGlobalHooks: true
+        notify:
+          - github_commit_status:
+              context: "x-pack/winlogbeat: 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-winlogbeat-check-update"
+
   - group: "x-pack/winlogbeat Mandatory Tests"
     key: "x-pack-winlogbeat-mandatory-tests"
     steps:
diff --git a/.github/workflows/check-winlogbeat.yml b/.github/workflows/check-winlogbeat.yml
deleted file mode 100644
index a79c4bef209a..000000000000
--- a/.github/workflows/check-winlogbeat.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: check-winlogbeat
-
-on:
-  pull_request:
-    paths:
-      - '.github/workflows/check-winlogbeat.yml'
-      - 'winlogbeat/**'
-      - 'x-pack/winlogbeat/**'
-
-env:
-  BEAT_MODULE: 'winlogbeat'
-
-permissions:
-  contents: read
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-go@v3
-      with:
-        go-version-file: .go-version
-    - name: Run check/update
-      run: |
-        go install github.com/magefile/mage
-        make -C ${{ env.BEAT_MODULE }} check update
-        make check-no-changes