Skip to content

Commit 4091507

Browse files
rbrtjrbrtj
authored
Merge branch 'main' into hide-top-influencers-panel
2 parents a503b06 + 4d67db1 commit 4091507

2,949 files changed

Lines changed: 65380 additions & 58958 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.

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 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
@@ -352,6 +351,7 @@ enabled:
352351
- x-pack/performance/journeys_e2e/tsdb_logs_data_visualizer.ts
353352
- x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
354353
- x-pack/performance/journeys_e2e/web_logs_dashboard.ts
354+
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
355355
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
356356
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
357357
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ enabled:
8181
- x-pack/test/security_solution_api_integration/test_suites/genai/knowledge_base/entries/trial_license_complete_tier/configs/serverless.config.ts
8282
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/serverless.config.ts
8383
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
84+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
8485
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
8586
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/serverless.config.ts
8687
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts

‎.buildkite/ftr_security_stateful_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ enabled:
6262
- x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
6363
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
6464
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts
65+
- x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/ess.config.ts
6566
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/ess.config.ts
6667
- x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/ess.config.ts
6768
- x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/ess.config.ts

‎.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ async function main() {
3838

3939
const preamble = locationFileLines.slice(0, 1);
4040

41-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
4241
const locationObj = jsYaml.load(
4342
locationFileLines.slice(1).join('\n')
4443
) as BackstageLocationResource;
4544
locationObj.spec.targets = pipelines.map(
4645
(fileName) => `${resourceDefinitionsBaseUrl}/${fileName}`
4746
);
4847

49-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
5048
const locationYaml = jsYaml.dump(locationObj, { lineWidth: 400 });
5149

5250
fs.writeFileSync(locationFile, `${preamble.join('\n')}\n${locationYaml}`);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* License v3.0 only", or the "Server Side Public License, v 1".
88
*/
99

10-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1110
import { dump } from 'js-yaml';
1211
import { BuildkiteClient, BuildkiteCommandStep } from './buildkite';
1312

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import axios, { AxiosInstance } from 'axios';
1111
import { execSync, ExecSyncOptions } from 'child_process';
1212

13-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1413
import { dump } from 'js-yaml';
1514

1615
import { parseLinkHeader } from './parse_link_header';

‎.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import * as Fs from 'fs';
1212
import * as globby from 'globby';
1313
import minimatch from 'minimatch';
1414

15-
// eslint-disable-next-line @kbn/eslint/no_unsafe_js_yaml
1615
import { load as loadYaml } from 'js-yaml';
1716

1817
import { BuildkiteClient, BuildkiteStep } from '../buildkite';
@@ -197,6 +196,32 @@ function getEnabledFtrConfigs(patterns?: string[]) {
197196
}
198197
}
199198

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

276-
const FTR_EXTRA_ARGS: Record<string, string> = process.env.FTR_EXTRA_ARGS
301+
const ftrExtraArgs: Record<string, string> = process.env.FTR_EXTRA_ARGS
277302
? { FTR_EXTRA_ARGS: process.env.FTR_EXTRA_ARGS }
278303
: {};
304+
const envFromlabels: Record<string, string> = collectEnvFromLabels();
279305

280306
const { defaultQueue, ftrConfigsByQueue } = getEnabledFtrConfigs(FTR_CONFIG_PATTERNS);
281307

@@ -514,7 +540,8 @@ export async function pickTestGroupRunOrder() {
514540
agents: expandAgentQueue(queue),
515541
env: {
516542
FTR_CONFIG_GROUP_KEY: key,
517-
...FTR_EXTRA_ARGS,
543+
...ftrExtraArgs,
544+
...envFromlabels,
518545
},
519546
retry: {
520547
automatic: [

‎.buildkite/scripts/steps/esql_generate_function_metadata.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euo pipefail
33

44
VALIDATION_PACKAGE_DIR="packages/kbn-esql-validation-autocomplete"
5-
EDITOR_PACKAGE_DIR="packages/kbn-text-based-editor"
5+
EDITOR_PACKAGE_DIR="packages/kbn-language-documentation-popover"
66
GIT_SCOPE="$VALIDATION_PACKAGE_DIR/**/* $EDITOR_PACKAGE_DIR/**/*"
77

88
report_main_step () {

‎.buildkite/scripts/steps/functional/performance_playwright.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,13 @@ if [ "$BUILDKITE_PIPELINE_SLUG" == "kibana-performance-data-set-extraction" ]; t
3939
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --skip-warmup
4040
else
4141
# pipeline should use bare metal static worker
42-
echo "--- Running performance tests"
43-
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
42+
if [[ -z "${JOURNEYS_GROUP+x}" ]]; then
43+
echo "--- Running performance tests"
44+
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
45+
else
46+
echo "--- Running performance tests: '$JOURNEYS_GROUP' group"
47+
node scripts/run_performance.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --group "$JOURNEYS_GROUP"
48+
fi
4449
fi
4550

4651
echo "--- Upload journey step screenshots"

‎.buildkite/scripts/steps/storybooks/build_and_upload.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const STORYBOOKS = [
2222
'coloring',
2323
'chart_icons',
2424
'content_management_examples',
25-
'controls',
2625
'custom_integrations',
2726
'dashboard_enhanced',
2827
'dashboard',

0 commit comments

Comments
 (0)