From a53a82f5463b737c78ee304cdd9f69bc0b570d4d Mon Sep 17 00:00:00 2001
From: Dimitrios Liappis <dimitrios.liappis@gmail.com>
Date: Tue, 30 Apr 2024 19:34:50 +0300
Subject: [PATCH] Enable DRA for 8.14 on Buildkite (#39321)

This commit enables publishing of DRA artifacts via Buildkite on the `8.14` by switching
the DRY_RUN default to `true.

Additionally it backports the Jenkins changes brought in #39322 that actually disable the
corresponding builds on Jenkins -- this is not really needed as Jenkins reads its configuration only from `main`
but it's done for consistency.

Relates: https://github.com/elastic/ingest-dev/issues/3095, #39322
---
 .buildkite/scripts/dra.sh | 18 ++++--------------
 .ci/jobs/packaging.yml    |  7 ++-----
 .pre-commit-config.yaml   |  1 -
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.buildkite/scripts/dra.sh b/.buildkite/scripts/dra.sh
index aeee80908a7..5ce6e5884b9 100755
--- a/.buildkite/scripts/dra.sh
+++ b/.buildkite/scripts/dra.sh
@@ -1,21 +1,11 @@
 #!/usr/bin/env bash
 
-# TODO: uncomment out below when Jenkins packaging has been stopped
-# if [[ "$DRY_RUN" == "true" ]]; then
-#     echo "~~~ Running in dry-run mode -- will NOT publish artifacts"
-#     DRY_RUN="--dry-run"
-# else
-#     echo "~~~ Running in publish mode"
-#     DRY_RUN=""
-# fi
-
-# TODO: delete the conditional below (and replace it with the above, uncommented out, section) after Jenkins packaging has been stopped
-if [[ "$DRY_RUN" == "false" ]]; then
-    echo "~~~ Running in publish mode"
-    DRY_RUN=""
-else
+if [[ "$DRY_RUN" == "true" ]]; then
     echo "~~~ Running in dry-run mode -- will NOT publish artifacts"
     DRY_RUN="--dry-run"
+else
+    echo "~~~ Running in publish mode"
+    DRY_RUN=""
 fi
 
 set -euo pipefail
diff --git a/.ci/jobs/packaging.yml b/.ci/jobs/packaging.yml
index a9d3f4bf00c..50cec32edd8 100644
--- a/.ci/jobs/packaging.yml
+++ b/.ci/jobs/packaging.yml
@@ -14,7 +14,7 @@
           discover-pr-forks-trust: 'permission'
           discover-pr-origin: 'merge-current'
           discover-tags: true
-          head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+          head-filter-regex: '(7\.1[6789]|8\.13|PR-.*|v8\.13\.\d+)'
           disable-pr-notifications: true
           notification-context: 'beats-packaging'
           repo: 'beats'
@@ -29,14 +29,11 @@
               ignore-tags-newer-than: 30
           - named-branches:
               - exact-name:
-                  name: 'main'
+                  name: '8.13'
                   case-sensitive: true
               - regex-name:
                   regex: '7\.1[6789]'
                   case-sensitive: true
-              - regex-name:
-                  regex: '8\.\d+'
-                  case-sensitive: true
           - change-request:
               ignore-target-only-changes: true
           clean:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 200d0b9277a..2c9643e3f95 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,4 +9,3 @@ repos:
     hooks:
     -   id: check-jenkins-pipelines
         files: ^(.ci/(.*\.groovy|Jenkinsfile)|Jenkinsfile)$
-    -   id: check-jjbb