diff --git a/.buildkite/scripts/dra.sh b/.buildkite/scripts/dra.sh index b20d6c6a696..ec9d523bf3c 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..6d4b136a557 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\.\d+|PR-.*|v\d+\.\d+\.\d+)' disable-pr-notifications: true notification-context: 'beats-packaging' repo: 'beats' @@ -28,9 +28,6 @@ ignore-tags-older-than: -1 ignore-tags-newer-than: 30 - named-branches: - - exact-name: - name: 'main' - case-sensitive: true - regex-name: regex: '7\.1[6789]' case-sensitive: true 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 diff --git a/catalog-info.yaml b/catalog-info.yaml index ea7d48d9a9f..116e5024663 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -1040,11 +1040,17 @@ spec: spec: repository: elastic/beats pipeline_file: ".buildkite/packaging.pipeline.yml" - branch_configuration: "main 8.* 7.17" + branch_configuration: "main" + # TODO enable after packaging backports for release branches + # branch_configuration: "main 8.* 7.17" cancel_intermediate_builds: false skip_intermediate_builds: false provider_settings: - trigger_mode: none + trigger_mode: code + env: + ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' + SLACK_NOTIFICATIONS_CHANNEL: '#ingest-notifications' + SLACK_NOTIFICATIONS_ON_SUCCESS: 'false' teams: ingest-fp: access_level: MANAGE_BUILD_AND_READ