Skip to content

Commit fac5213

Browse files
kc13greinerkc13greiner
authored
Merge branch 'main' into feature/dev_container_user_change
2 parents 886f0ea + 31c9e75 commit fac5213

2,932 files changed

Lines changed: 77197 additions & 70869 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/ftr_platform_stateful_configs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ enabled:
4444
- test/api_integration/config.js
4545
- test/examples/config.js
4646
- test/functional/apps/bundles/config.ts
47-
- test/functional/apps/console/monaco/config.ts
48-
- test/functional/apps/console/ace/config.ts
47+
- test/functional/apps/console/config.ts
4948
- test/functional/apps/context/config.ts
5049
- test/functional/apps/dashboard_elements/controls/common/config.ts
5150
- test/functional/apps/dashboard_elements/controls/options_list/config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ disabled:
2121
- x-pack/test/osquery_cypress/visual_config.ts
2222
- x-pack/test/security_solution_cypress/cli_config.ts
2323
- x-pack/test/security_solution_cypress/config.ts
24-
- x-pack/test/threat_intelligence_cypress/cli_config_parallel.ts
25-
- x-pack/test/threat_intelligence_cypress/config.ts
2624

2725
# Playwright
2826
- x-pack/test/security_solution_playwright/playwright.config.ts

‎.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/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,32 @@ function getEnabledFtrConfigs(patterns?: string[]) {
197197
}
198198
}
199199

200+
/**
201+
* Collects environment variables from labels on the PR
202+
* TODO: extract this (and other functions from this big file) to a separate module
203+
*/
204+
function collectEnvFromLabels() {
205+
const LABEL_MAPPING: Record<string, Record<string, string>> = {
206+
'ci:use-chrome-beta': {
207+
USE_CHROME_BETA: 'true',
208+
},
209+
};
210+
211+
const envFromlabels: Record<string, string> = {};
212+
if (!process.env.GITHUB_PR_LABELS) {
213+
return envFromlabels;
214+
} else {
215+
const labels = process.env.GITHUB_PR_LABELS.split(',');
216+
labels.forEach((label) => {
217+
const env = LABEL_MAPPING[label];
218+
if (env) {
219+
Object.assign(envFromlabels, env);
220+
}
221+
});
222+
return envFromlabels;
223+
}
224+
}
225+
200226
export async function pickTestGroupRunOrder() {
201227
const bk = new BuildkiteClient();
202228
const ciStats = new CiStatsClient();
@@ -273,9 +299,10 @@ export async function pickTestGroupRunOrder() {
273299
.filter(Boolean)
274300
: ['build'];
275301

276-
const FTR_EXTRA_ARGS: Record<string, string> = process.env.FTR_EXTRA_ARGS
302+
const ftrExtraArgs: Record<string, string> = process.env.FTR_EXTRA_ARGS
277303
? { FTR_EXTRA_ARGS: process.env.FTR_EXTRA_ARGS }
278304
: {};
305+
const envFromlabels: Record<string, string> = collectEnvFromLabels();
279306

280307
const { defaultQueue, ftrConfigsByQueue } = getEnabledFtrConfigs(FTR_CONFIG_PATTERNS);
281308

@@ -514,7 +541,8 @@ export async function pickTestGroupRunOrder() {
514541
agents: expandAgentQueue(queue),
515542
env: {
516543
FTR_CONFIG_GROUP_KEY: key,
517-
...FTR_EXTRA_ARGS,
544+
...ftrExtraArgs,
545+
...envFromlabels,
518546
},
519547
retry: {
520548
automatic: [

‎.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 {

0 commit comments

Comments
 (0)