Skip to content

[Console] Console definitions script should generate separate prs for main and 8.x #207036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sabarasaba merged 7 commits into from
Jan 28, 2025
Merged

[Console] Console definitions script should generate separate prs for main and 8.x #207036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df8c481
Generation script should create prs for 8.x and main separately
sabarasaba Jan 17, 2025
e2d010c
commit with @elastic email
sabarasaba Jan 17, 2025
bf26e28
Use separate pipeline for each branch we need to build for
sabarasaba Jan 22, 2025
8e0d31f
Target PR to the right branch
sabarasaba Jan 22, 2025
faa3dfd
Merge branch 'main' into console-improve_generation_script
elasticmachine Jan 22, 2025
b143816
Merge branch 'main' into console-improve_generation_script
elasticmachine Jan 27, 2025
4d79d62
Address CR changes
sabarasaba Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildkite/pipeline-resource-definitions/kibana-console-definitions-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 11 additions & 3 deletions .buildkite/scripts/steps/console_definitions_sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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