Skip to content

Commit fa15b79

Browse files
dplumleedplumlee
committed
Merge remote-tracking branch 'upstream/main' into query-diff-algorithm-integration-tests
2 parents b01b5ba + 3ad697b commit fa15b79

1,817 files changed

Lines changed: 29841 additions & 22607 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.backportrc.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"repoName": "kibana",
44
"targetBranchChoices": [
55
"main",
6+
"8.x",
67
"8.15",
78
"8.14",
89
"8.13",
@@ -52,7 +53,8 @@
5253
"backport"
5354
],
5455
"branchLabelMapping": {
55-
"^v8.16.0$": "main",
56+
"^v9.0.0$": "main",
57+
"^v8.16.0$": "8.x",
5658
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
5759
},
5860
"autoMerge": true,

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 7.17
25+
branch_configuration: main 8.x 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -49,6 +49,10 @@ spec:
4949
cronline: 0 9 * * * America/New_York
5050
message: Daily build
5151
branch: main
52+
Daily build (8.x):
53+
cronline: 0 9 * * * America/New_York
54+
message: Daily build
55+
branch: '8.x'
5256
Daily build (8.15):
5357
cronline: 0 9 * * * America/New_York
5458
message: Daily build
@@ -82,7 +86,7 @@ spec:
8286
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
8387
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
8488
allow_rebuilds: true
85-
branch_configuration: main 8.15 7.17
89+
branch_configuration: main 8.x 8.15 7.17
8690
default_branch: main
8791
repository: elastic/kibana
8892
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -130,7 +134,7 @@ spec:
130134
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
131135
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
132136
allow_rebuilds: true
133-
branch_configuration: main 8.15 7.17
137+
branch_configuration: main 8.x 8.15 7.17
134138
default_branch: main
135139
repository: elastic/kibana
136140
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml

‎.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ spec:
3434
teams:
3535
kibana-operations:
3636
access_level: MANAGE_BUILD_AND_READ
37+
kibana-security:
38+
access_level: MANAGE_BUILD_AND_READ
3739
everyone:
3840
access_level: READ_ONLY

‎.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
2323
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2424
allow_rebuilds: true
25-
branch_configuration: main 8.15 7.17
25+
branch_configuration: main 8.x 8.15 7.17
2626
default_branch: main
2727
repository: elastic/kibana
2828
pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml

‎.buildkite/pipeline-resource-definitions/kibana-on-merge.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
REPORT_FAILED_TESTS_TO_GITHUB: 'true'
2626
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
2727
allow_rebuilds: true
28-
branch_configuration: main 7.17 8.15
28+
branch_configuration: main 8.x 8.15 7.17
2929
default_branch: main
3030
repository: elastic/kibana
3131
pipeline_file: .buildkite/pipelines/on_merge.yml

‎.buildkite/pipeline-utils/utils.test.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ describe('getVersionsFile', () => {
3636
const versionsFile = getVersionsFile();
3737

3838
expect(versionsFile.prevMajors).to.be.an('array');
39-
expect(versionsFile.prevMajors.length).to.eql(1);
40-
expect(versionsFile.prevMajors[0].branch).to.eql('7.17');
41-
4239
expect(versionsFile.prevMinors).to.be.an('array');
4340
});
4441

‎.buildkite/pipeline-utils/utils.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const getVersionsFile = (() => {
4343
prevMinors: Version[];
4444
prevMajors: Version[];
4545
current: Version;
46+
versions: Version[];
4647
};
4748
const versionsFileName = 'versions.json';
4849
try {

‎.buildkite/pull_requests.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"enabled": true,
99
"allow_org_users": true,
1010
"allowed_repo_permissions": ["admin", "write"],
11+
"allowed_list": ["elastic-vault-github-plugin-prod[bot]"],
1112
"set_commit_status": true,
1213
"commit_status_context": "kibana-ci",
1314
"build_on_commit": true,

‎.buildkite/scripts/lifecycle/post_command.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
3535
buildkite-agent artifact upload 'x-pack/test/functional/failure_debug/html/*.html'
3636
buildkite-agent artifact upload '.es/**/*.hprof'
3737
buildkite-agent artifact upload 'data/es_debug_*.tar.gz'
38+
buildkite-agent artifact upload '.es/es*.log'
3839

3940
if [[ $BUILDKITE_COMMAND_EXIT_STATUS -ne 0 ]]; then
4041
if [[ $BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG == 'elasticsearch-serverless-intake' ]]; then

‎.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.test.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('pipeline trigger combinations', () => {
2525
it('should trigger the correct pipelines for "es-forward"', () => {
2626
const esForwardTriggers = getESForwardPipelineTriggers();
2727
// tests 7.17 against 8.x versions
28-
const targets = versionsFile.versions.filter((v) => v.currentMajor === true);
28+
const targets = versionsFile.versions.filter((v) => v.branch.startsWith('8.'));
2929

3030
expect(esForwardTriggers.length).to.eql(targets.length);
3131

@@ -43,7 +43,6 @@ describe('pipeline trigger combinations', () => {
4343
const snapshotTriggers = getArtifactSnapshotPipelineTriggers();
4444
// triggers for all open branches
4545
const branches = versionsFile.versions.map((v) => v.branch);
46-
4746
expect(snapshotTriggers.length).to.eql(branches.length);
4847

4948
branches.forEach((b) => {
@@ -53,9 +52,10 @@ describe('pipeline trigger combinations', () => {
5352

5453
it('should trigger the correct pipelines for "artifacts-trigger"', () => {
5554
const triggerTriggers = getArtifactBuildTriggers();
56-
// all currentMajor+prevMinor branches
55+
// all branches that have fixed versions, and excluding 7.17 (i.e. not 7.17, [0-9].x and main)
5756
const branches = versionsFile.versions
58-
.filter((v) => v.currentMajor === true && v.previousMinor === true)
57+
.filter((v) => v.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
58+
.filter((v) => v.previousMajor === true)
5959
.map((v) => v.branch);
6060

6161
expect(triggerTriggers.length).to.eql(branches.length);
@@ -66,9 +66,9 @@ describe('pipeline trigger combinations', () => {
6666

6767
it('should trigger the correct pipelines for "artifacts-staging"', () => {
6868
const stagingTriggers = getArtifactStagingPipelineTriggers();
69-
// all branches that are not currentMajor+currentMinor
69+
// all branches that have fixed versions (i.e. not [0-9].x and main)
7070
const branches = versionsFile.versions
71-
.filter((v) => !v.currentMajor || !v.currentMinor)
71+
.filter((v) => v.branch.match(/[0-9]{1,2}\.[0-9]{1,2}/))
7272
.map((v) => v.branch);
7373

7474
expect(stagingTriggers.length).to.eql(branches.length);

0 commit comments

Comments
 (0)