Skip to content

Commit

Permalink
Re-enable org wide PR bot (#195131)
Browse files Browse the repository at this point in the history
#194768 without the merge
conflicts.

Switches over to the org wide PR bot, with backwards compatibility for
both versions.

Updating the pipeline definition here is a global set for environment
variables on all branches, so I intend on merging the backports first to
support both versions and then proceeding with this.
  • Loading branch information
jbudz authored Oct 7, 2024
1 parent 484f95e commit 149c514
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
spec:
env:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
GITHUB_COMMIT_STATUS_CONTEXT: buildkite/on-merge
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ spec:
description: Runs manually for pull requests
spec:
env:
PR_COMMENTS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_PR_COMMENTS_ENABLED: 'true'
ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED: 'true'
ELASTIC_GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
GITHUB_BUILD_COMMIT_STATUS_CONTEXT: kibana-ci
GITHUB_STEP_COMMIT_STATUS_ENABLED: 'true'
allow_rebuilds: true
branch_configuration: ''
cancel_intermediate_builds: true
Expand Down
5 changes: 4 additions & 1 deletion .buildkite/pipeline-utils/test-failures/annotate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ export const annotateTestFailures = async () => {

buildkite.setAnnotation('test_failures', 'error', getAnnotation(failures, failureHtmlArtifacts));

if (process.env.PR_COMMENTS_ENABLED === 'true') {
if (
process.env.PR_COMMENTS_ENABLED === 'true' ||
process.env.ELASTIC_PR_COMMENTS_ENABLED === 'true'
) {
buildkite.setMetadata(
'pr_comment:test_failures:body',
getPrComment(failures, failureHtmlArtifacts)
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/lifecycle/post_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -euo pipefail
BUILD_SUCCESSFUL=$(ts-node "$(dirname "${0}")/build_status.ts")
export BUILD_SUCCESSFUL

if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
"$(dirname "${0}")/commit_status_complete.sh"
fi

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/lifecycle/pre_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euo pipefail

source .buildkite/scripts/common/util.sh

if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
if [[ "${GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]] && [[ "${ELASTIC_GITHUB_BUILD_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
"$(dirname "${0}")/commit_status_start.sh"
fi

Expand Down

0 comments on commit 149c514

Please sign in to comment.