diff --git a/.buildkite/pipelines/pull_request/ftr_bench.yml b/.buildkite/pipelines/pull_request/ftr_bench.yml index e0964591ae76c..807c6a94cb646 100644 --- a/.buildkite/pipelines/pull_request/ftr_bench.yml +++ b/.buildkite/pipelines/pull_request/ftr_bench.yml @@ -2,8 +2,8 @@ steps: - command: .buildkite/scripts/steps/ftr_bench.sh label: 'FTR Bench' agents: - machineType: c2d-standard-16 - zones: northamerica-northeast2-b,us-central1-c,us-central1-a + machineType: c4d-standard-16 + diskType: hyperdisk-balanced diskSizeGb: 200 key: ftr_bench timeout_in_minutes: 120 diff --git a/.buildkite/pipelines/pull_request/jest_bench.yml b/.buildkite/pipelines/pull_request/jest_bench.yml index 378beea5b6552..260232a4ad3c8 100644 --- a/.buildkite/pipelines/pull_request/jest_bench.yml +++ b/.buildkite/pipelines/pull_request/jest_bench.yml @@ -2,7 +2,8 @@ steps: - command: .buildkite/scripts/steps/jest_bench.sh label: 'Jest Bench' agents: - machineType: n2-highmem-16 + machineType: c4d-standard-16 + diskType: hyperdisk-balanced diskSizeGb: 100 key: jest_bench timeout_in_minutes: 60 diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts index c7cde7df65a92..3e5c71145f161 100644 --- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts +++ b/.buildkite/scripts/pipelines/pull_request/pipeline.ts @@ -505,11 +505,36 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R pipeline.push(getPipeline('.buildkite/pipelines/pull_request/check_saved_objects.yml')); } - if (GITHUB_PR_LABELS.includes('ci:bench-jest')) { + if ( + (await doAnyChangesMatch([ + /^packages\/kbn-babel-preset/, + /^packages\/kbn-repo-file-maps/, + /^src\/platform\/packages\/private\/kbn-babel-transform/, + /^src\/platform\/packages\/private\/kbn-import-resolver/, + /^src\/platform\/packages\/private\/kbn-jest-serializers/, + /^src\/platform\/packages\/private\/kbn-repo-packages/, + /^src\/platform\/packages\/shared\/kbn-babel-register/, + /^src\/platform\/packages\/shared\/kbn-jest-benchmarks/, + /^src\/platform\/packages\/shared\/kbn-repo-info/, + /^src\/platform\/packages\/shared\/kbn-test/, + /^src\/setup_node_env/, + ])) || + GITHUB_PR_LABELS.includes('ci:bench-jest') + ) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/jest_bench.yml')); } - if (GITHUB_PR_LABELS.includes('ci:bench-ftr')) { + if ( + (await doAnyChangesMatch([ + /^src\/platform\/packages\/shared\/kbn-es/, + /^src\/platform\/packages\/shared\/kbn-ftr-benchmarks/, + /^src\/platform\/packages\/shared\/kbn-ftr-common-functional-services/, + /^src\/platform\/packages\/shared\/kbn-ftr-common-functional-ui-services/, + /^src\/platform\/packages\/shared\/kbn-test/, + /^src\/setup_node_env/, + ])) || + GITHUB_PR_LABELS.includes('ci:bench-ftr') + ) { pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ftr_bench.yml')); } diff --git a/src/platform/packages/shared/kbn-ftr-benchmarks/benchmark.config.ts b/src/platform/packages/shared/kbn-ftr-benchmarks/benchmark.config.ts index 369fdcad01064..aa8d5b1a53aa0 100644 --- a/src/platform/packages/shared/kbn-ftr-benchmarks/benchmark.config.ts +++ b/src/platform/packages/shared/kbn-ftr-benchmarks/benchmark.config.ts @@ -35,7 +35,6 @@ const config: InitialBenchConfig = { name: 'ftr', benchmarks: [ createBenchmark('discover', 'src/platform/test/functional/apps/discover/group8/config.ts'), - createBenchmark('fleet', 'x-pack/platform/test/fleet_functional/config.ts'), createBenchmark( 'security-saml', 'x-pack/solutions/security/test/cloud_security_posture_functional/config.agentless.ts' @@ -45,7 +44,7 @@ const config: InitialBenchConfig = { 'x-pack/platform/test/functional/apps/lens/open_in_lens/dashboard/config.ts' ), ], - runs: 2, + runs: 1, timeout: 10 * 300_000, };