chore(NA): prepare replacement of 8.x branch with 8.19 (#218514)

This PR prepares the changes needed for removing 8.x branch and create
8.19.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Tiago Costa 2025-04-17 04:02:40 +01:00 committed by GitHub
parent 4241af55f3
commit b3e442ebbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 22 additions and 25 deletions

View file

@ -4,7 +4,7 @@
"targetBranchChoices": [ "targetBranchChoices": [
"main", "main",
"9.0", "9.0",
"8.x", "8.19",
"8.18", "8.18",
"8.17", "8.17",
"8.16", "8.16",
@ -58,7 +58,6 @@
], ],
"branchLabelMapping": { "branchLabelMapping": {
"^v9.1.0$": "main", "^v9.1.0$": "main",
"^v8.19.0$": "8.x",
"^v(\\d+).(\\d+).\\d+$": "$1.$2" "^v(\\d+).(\\d+).\\d+$": "$1.$2"
}, },
"autoMerge": true, "autoMerge": true,

View file

@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management' SLACK_NOTIFICATIONS_CHANNEL: '#kibana-management'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: false allow_rebuilds: false
branch_configuration: main 8.x branch_configuration: main 8.19
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/console_definitions_sync.yml pipeline_file: .buildkite/pipelines/console_definitions_sync.yml

View file

@ -3,7 +3,7 @@ apiVersion: backstage.io/v1alpha1
kind: Resource kind: Resource
metadata: metadata:
name: bk-kibana-es-forward-compatibility-testing-9-dot-0 name: bk-kibana-es-forward-compatibility-testing-9-dot-0
description: Forward compatibility testing between Kibana 8.18 and ES 9+ description: Forward compatibility testing between Kibana 8.19 and ES 9+
links: links:
- url: 'https://buildkite.com/elastic/kibana-es-forward-compatibility-testing-9-dot-0' - url: 'https://buildkite.com/elastic/kibana-es-forward-compatibility-testing-9-dot-0'
title: Pipeline link title: Pipeline link
@ -16,7 +16,7 @@ spec:
kind: Pipeline kind: Pipeline
metadata: metadata:
name: kibana / ES Forward Compatibility Testing 9.0 name: kibana / ES Forward Compatibility Testing 9.0
description: Forward compatibility testing between Kibana 8.18 and ES 9+ description: Forward compatibility testing between Kibana 8.19 and ES 9+
spec: spec:
env: env:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts' SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
@ -26,7 +26,7 @@ spec:
branch_configuration: main branch_configuration: main
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_forward_9_dot_0.yml # Note: this file exists in 8.x only and should be moved into 8.18 once the branch is cut pipeline_file: .buildkite/pipelines/es_forward_9_dot_0.yml
skip_intermediate_builds: false skip_intermediate_builds: false
provider_settings: provider_settings:
prefix_pull_request_fork_branch_names: false prefix_pull_request_fork_branch_names: false

View file

@ -22,7 +22,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts' SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true allow_rebuilds: true
branch_configuration: main 9.0 8.x 8.18 8.17 7.17 branch_configuration: main 9.0 8.19 8.18 8.17 8.16 7.17
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@ -52,10 +52,10 @@ spec:
cronline: 0 22 * * * America/New_York cronline: 0 22 * * * America/New_York
message: Daily build message: Daily build
branch: '9.0' branch: '9.0'
Daily build (8.x): Daily build (8.19):
cronline: 0 22 * * * America/New_York cronline: 0 22 * * * America/New_York
message: Daily build message: Daily build
branch: '8.x' branch: '8.19'
Daily build (8.18): Daily build (8.18):
cronline: 0 22 * * * America/New_York cronline: 0 22 * * * America/New_York
message: Daily build message: Daily build
@ -95,7 +95,7 @@ spec:
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts' SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
allow_rebuilds: true allow_rebuilds: true
branch_configuration: main 9.0 8.x 8.18 8.17 7.17 branch_configuration: main 9.0 8.19 8.18 8.17 8.16 7.17
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@ -144,7 +144,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
REPORT_FAILED_TESTS_TO_GITHUB: 'true' REPORT_FAILED_TESTS_TO_GITHUB: 'true'
allow_rebuilds: true allow_rebuilds: true
branch_configuration: main 9.0 8.x 8.18 8.17 7.17 branch_configuration: main 9.0 8.19 8.18 8.17 8.16 7.17
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

View file

@ -23,7 +23,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SCOUT_REPORTER_ENABLED: 'true' SCOUT_REPORTER_ENABLED: 'true'
allow_rebuilds: true allow_rebuilds: true
branch_configuration: main 9.0 8.x 8.18 8.17 7.17 branch_configuration: main 9.0 8.19 8.18 8.17 8.16 7.17
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

View file

@ -26,7 +26,7 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true' ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
SCOUT_REPORTER_ENABLED: 'true' SCOUT_REPORTER_ENABLED: 'true'
allow_rebuilds: true allow_rebuilds: true
branch_configuration: main 9.0 8.x 8.18 8.17 7.17 branch_configuration: main 9.0 8.19 8.18 8.17 8.16 7.17
default_branch: main default_branch: main
repository: elastic/kibana repository: elastic/kibana
pipeline_file: .buildkite/pipelines/on_merge.yml pipeline_file: .buildkite/pipelines/on_merge.yml

View file

@ -97,15 +97,13 @@ export function getESForwardPipelineTriggers(): BuildkiteTriggerStep[] {
/** /**
* This pipeline is testing the forward compatibility of Kibana with different versions of Elasticsearch for 9.0. * This pipeline is testing the forward compatibility of Kibana with different versions of Elasticsearch for 9.0.
* Should be triggered for combinations of (Kibana@8.18 + ES@9.x {current open branches on the same major}) * Should be triggered for combinations of (Kibana@8.19 + ES@9.x {current open branches on the same major})
*/ */
export function getESForward9Dot0PipelineTriggers(): BuildkiteTriggerStep[] { export function getESForward9Dot0PipelineTriggers(): BuildkiteTriggerStep[] {
const versions = getVersionsFile(); const versions = getVersionsFile();
const KIBANA_8_X = versions.versions.find((v) => v.branch === '8.x'); const KIBANA_8_19 = versions.versions.find((v) => v.branch === '8.19');
if (!KIBANA_8_X) { if (!KIBANA_8_19) {
throw new Error( throw new Error('Update ES forward compatibility 9.0 pipeline to 8.19');
'Update ES forward compatibility 9.0 pipeline to remove 8.x and add version 8.18'
);
} }
const targetESVersions = versions.versions.filter( const targetESVersions = versions.versions.filter(
(v) => v.branch.startsWith('9.') || (v.branch.includes('main') && v.version.startsWith('9.0.0')) (v) => v.branch.startsWith('9.') || (v.branch.includes('main') && v.version.startsWith('9.0.0'))
@ -115,10 +113,10 @@ export function getESForward9Dot0PipelineTriggers(): BuildkiteTriggerStep[] {
return { return {
trigger: pipelineSets['es-forward-9-dot-0'], trigger: pipelineSets['es-forward-9-dot-0'],
async: true, async: true,
label: `Triggering Kibana ${KIBANA_8_X.version} + ES ${version} forward compatibility`, label: `Triggering Kibana ${KIBANA_8_19.version} + ES ${version} forward compatibility`,
build: { build: {
message: process.env.MESSAGE || `ES forward-compatibility test for ES ${version}`, message: process.env.MESSAGE || `ES forward-compatibility test for ES ${version}`,
branch: KIBANA_8_X.branch, branch: KIBANA_8_19.branch,
commit: 'HEAD', commit: 'HEAD',
env: { env: {
ES_SNAPSHOT_MANIFEST: `https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${version}/manifest-latest-verified.json`, ES_SNAPSHOT_MANIFEST: `https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${version}/manifest-latest-verified.json`,

View file

@ -46,11 +46,11 @@ if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
exit 0; exit 0;
fi fi
if [[ "$BUILDKITE_BRANCH" == "8.x" ]]; then if [[ "$BUILDKITE_BRANCH" == "8.19" ]]; then
BUMP_KIBANA_DOC_NAME="$(vault_get kibana-bump-sh kibana-doc-name)" BUMP_KIBANA_DOC_NAME="$(vault_get kibana-bump-sh kibana-doc-name)"
BUMP_KIBANA_DOC_TOKEN="$(vault_get kibana-bump-sh kibana-token)" BUMP_KIBANA_DOC_TOKEN="$(vault_get kibana-bump-sh kibana-token)"
deploy_to_bump "$(pwd)/oas_docs/output/kibana.yaml" $BUMP_KIBANA_DOC_NAME $BUMP_KIBANA_DOC_TOKEN 8x-unreleased; deploy_to_bump "$(pwd)/oas_docs/output/kibana.yaml" $BUMP_KIBANA_DOC_NAME $BUMP_KIBANA_DOC_TOKEN 8dot19;
exit 0; exit 0;
fi fi
echo "No branches found to push to; stopping here." echo "No branches found to push to; stopping here."

View file

@ -15,7 +15,7 @@
}, },
{ {
"version": "8.19.0", "version": "8.19.0",
"branch": "8.x", "branch": "8.19",
"previousMajor": true "previousMajor": true
}, },
{ {