diff --git a/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml b/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml index a228823202c01..b4ca2b3e00e6e 100644 --- a/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml +++ b/.buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml @@ -22,7 +22,7 @@ spec: SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' allow_rebuilds: false - branch_configuration: main + branch_configuration: main 8.x default_branch: main repository: elastic/kibana pipeline_file: .buildkite/pipelines/console_definitions_sync.yml diff --git a/.buildkite/scripts/steps/console_definitions_sync.sh b/.buildkite/scripts/steps/console_definitions_sync.sh index 71d70138f8a1b..8431d8debc59f 100755 --- a/.buildkite/scripts/steps/console_definitions_sync.sh +++ b/.buildkite/scripts/steps/console_definitions_sync.sh @@ -13,7 +13,7 @@ main () { report_main_step "Cloning repositories" rm -rf elasticsearch-specification - if ! git clone https://github.com/elastic/elasticsearch-specification --depth 1; then + if ! git clone --branch "$BUILDKITE_BRANCH" https://github.com/elastic/elasticsearch-specification --depth 1; then echo "Error: Failed to clone the elasticsearch-specification repository." exit 1 fi @@ -40,7 +40,7 @@ main () { git config --global user.name "$KIBANA_MACHINE_USERNAME" git config --global user.email '42973632+kibanamachine@users.noreply.github.com' - PR_TITLE='[Console] Update console definitions' + PR_TITLE="[Console] Update console definitions (${branch_name})" PR_BODY='This PR updates the console definitions to match the latest ones from the @elastic/elasticsearch-specification repo.' # Check if a PR already exists @@ -66,7 +66,15 @@ main () { git push origin "$BRANCH_NAME" # Create PR - gh pr create --title "$PR_TITLE" --body "$PR_BODY" --base main --head "${BRANCH_NAME}" --label 'release_note:skip' --label 'Feature:Console' --label 'Team:Kibana Management' + gh pr create \ + --title "$PR_TITLE" \ + --body "$PR_BODY" \ + --base "$BUILDKITE_BRANCH" \ + --head "$BRANCH_NAME" \ + --label 'backport:skip' \ + --label 'release_note:skip' \ + --label 'Feature:Console' \ + --label 'Team:Kibana Management' } main