Skip to content

Commit

Permalink
Enable DRA for 8.14 on Buildkite (#39321)
Browse files Browse the repository at this point in the history
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: elastic/ingest-dev#3095, #39322
  • Loading branch information
dliappis committed Apr 30, 2024
1 parent 6e0fabe commit a53a82f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
18 changes: 4 additions & 14 deletions .buildkite/scripts/dra.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 2 additions & 5 deletions .ci/jobs/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand Down
1 change: 0 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ repos:
hooks:
- id: check-jenkins-pipelines
files: ^(.ci/(.*\.groovy|Jenkinsfile)|Jenkinsfile)$
- id: check-jjbb

0 comments on commit a53a82f

Please sign in to comment.