Skip to content

Commit d0fd676

Browse files
author
Thomas Watson
authored
Merge branch 'main' into update-check-type-commits
2 parents 9979c52 + 4c07f9c commit d0fd676

2,573 files changed

Lines changed: 57801 additions & 19566 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_configs.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ enabled:
100100
- test/functional/apps/dashboard_elements/controls/options_list/config.ts
101101
- test/functional/apps/dashboard_elements/image_embeddable/config.ts
102102
- test/functional/apps/dashboard_elements/input_control_vis/config.ts
103+
- test/functional/apps/dashboard_elements/links/config.ts
103104
- test/functional/apps/dashboard_elements/markdown/config.ts
104105
- test/functional/apps/dashboard/group1/config.ts
105106
- test/functional/apps/dashboard/group2/config.ts
@@ -310,6 +311,7 @@ enabled:
310311
- x-pack/test/functional/apps/reporting_management/config.ts
311312
- x-pack/test/functional/apps/rollup_job/config.ts
312313
- x-pack/test/functional/apps/saved_objects_management/config.ts
314+
- x-pack/test/functional/apps/saved_query_management/config.ts
313315
- x-pack/test/functional/apps/security/config.ts
314316
- x-pack/test/functional/apps/snapshot_restore/config.ts
315317
- x-pack/test/functional/apps/spaces/config.ts
@@ -357,6 +359,7 @@ enabled:
357359
- x-pack/test/saved_object_api_integration/spaces_only/config.ts
358360
- x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
359361
- x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
362+
- x-pack/test/saved_object_tagging/api_integration/tagging_usage_collection/config.ts
360363
- x-pack/test/saved_object_tagging/functional/config.ts
361364
- x-pack/test/saved_objects_field_count/config.ts
362365
- x-pack/test/search_sessions_integration/config.ts
@@ -400,16 +403,22 @@ enabled:
400403
- x-pack/test/upgrade_assistant_integration/config.js
401404
- x-pack/test/usage_collection/config.ts
402405
- x-pack/test_serverless/api_integration/test_suites/observability/config.ts
406+
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
407+
- x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
403408
- x-pack/test_serverless/api_integration/test_suites/search/config.ts
409+
- x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
404410
- x-pack/test_serverless/api_integration/test_suites/security/config.ts
411+
- x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
405412
- x-pack/test_serverless/functional/test_suites/observability/config.ts
406413
- x-pack/test_serverless/functional/test_suites/observability/config.examples.ts
407-
- x-pack/test_serverless/api_integration/test_suites/observability/config.feature_flags.ts
414+
- x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts
408415
- x-pack/test_serverless/functional/test_suites/search/config.ts
409416
- x-pack/test_serverless/functional/test_suites/search/config.examples.ts
410417
- x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
418+
- x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts
411419
- x-pack/test_serverless/functional/test_suites/security/config.ts
412420
- x-pack/test_serverless/functional/test_suites/security/config.examples.ts
421+
- x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts
413422
- x-pack/performance/journeys/ecommerce_dashboard.ts
414423
- x-pack/performance/journeys/ecommerce_dashboard_map_only.ts
415424
- x-pack/performance/journeys/flight_dashboard.ts

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,16 +154,15 @@ steps:
154154
- exit_status: '-1'
155155
limit: 3
156156

157-
# TODO: Enable in #166813 after fixing types
158-
# - command: .buildkite/scripts/steps/check_types.sh
159-
# label: 'Check Types'
160-
# agents:
161-
# queue: n2-16-spot
162-
# timeout_in_minutes: 60
163-
# retry:
164-
# automatic:
165-
# - exit_status: '-1'
166-
# limit: 3
157+
- command: .buildkite/scripts/steps/check_types.sh
158+
label: 'Check Types'
159+
agents:
160+
queue: n2-16-spot
161+
timeout_in_minutes: 60
162+
retry:
163+
automatic:
164+
- exit_status: '-1'
165+
limit: 3
167166

168167
- command: .buildkite/scripts/steps/storybooks/build_and_upload.sh
169168
label: 'Build Storybooks'

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,12 @@ steps:
136136
- exit_status: '-1'
137137
limit: 3
138138

139-
# TODO: Enable in #166813 after fixing types
140-
# - command: .buildkite/scripts/steps/check_types.sh
141-
# label: 'Check Types'
142-
# agents:
143-
# queue: n2-16-spot
144-
# timeout_in_minutes: 60
145-
# retry:
146-
# automatic:
147-
# - exit_status: '-1'
148-
# limit: 3
139+
- command: .buildkite/scripts/steps/check_types.sh
140+
label: 'Check Types'
141+
agents:
142+
queue: n2-16-spot
143+
timeout_in_minutes: 60
144+
retry:
145+
automatic:
146+
- exit_status: '-1'
147+
limit: 3

‎.buildkite/pipelines/pull_request/osquery_cypress.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,16 @@ steps:
2525
artifact_paths:
2626
- "target/kibana-osquery/**/*"
2727

28-
# Error: self-signed certificate in certificate chain
29-
# - command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
30-
# label: 'Serverless Osquery Cypress Tests'
31-
# agents:
32-
# queue: n2-4-spot
33-
# depends_on: build
34-
# timeout_in_minutes: 50
35-
# parallelism: 6
36-
# retry:
37-
# automatic:
38-
# - exit_status: '*'
39-
# limit: 1
40-
# artifact_paths:
41-
# - "target/kibana-osquery/**/*"
28+
- command: .buildkite/scripts/steps/functional/security_serverless_osquery.sh
29+
label: 'Serverless Osquery Cypress Tests'
30+
agents:
31+
queue: n2-4-spot
32+
depends_on: build
33+
timeout_in_minutes: 50
34+
parallelism: 6
35+
retry:
36+
automatic:
37+
- exit_status: '*'
38+
limit: 1
39+
artifact_paths:
40+
- "target/kibana-osquery/**/*"

‎.buildkite/pipelines/pull_request/security_solution.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ steps:
2828
agents:
2929
queue: n2-4-spot
3030
depends_on: build
31-
timeout_in_minutes: 120
32-
parallelism: 6
31+
timeout_in_minutes: 60
32+
parallelism: 8
3333
retry:
3434
automatic:
3535
- exit_status: '*'
@@ -40,7 +40,7 @@ steps:
4040
agents:
4141
queue: n2-4-spot
4242
depends_on: build
43-
timeout_in_minutes: 120
43+
timeout_in_minutes: 60
4444
parallelism: 1
4545
retry:
4646
automatic: false

‎.buildkite/pipelines/pull_request/type_check_selective.yml‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ steps:
2121
build:
2222
env:
2323
ENVIRONMENT: ${ENVIRONMENT}
24+
EC_ENV: qa
25+
EC_REGION: aws-eu-west-1
2426
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-qa.yaml)"
2527

2628
- group: ":female-detective: Security Solution Tests"

‎.buildkite/pipelines/quality-gates/pipeline.tests-staging.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ steps:
2121
NAME_PREFIX: ci_test_kibana-promotion_
2222
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
2323

24+
- label: ":pipeline::kibana::seedling: Trigger Kibana Serverless Tests for ${ENVIRONMENT}"
25+
trigger: appex-qa-serverless-kibana-ftr-tests # https://buildkite.com/elastic/appex-qa-serverless-kibana-ftr-tests
26+
soft_fail: true # Remove this before release or when tests stabilize
27+
build:
28+
env:
29+
ENVIRONMENT: ${ENVIRONMENT}
30+
EC_ENV: staging
31+
EC_REGION: aws-us-east-1
32+
message: "${BUILDKITE_MESSAGE} (triggered by pipeline.tests-staging.yaml)"
33+
2434
- wait: ~
2535

2636
- label: ":judge::seedling: Trigger Manual Tests Phase"

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ const uploadPipeline = (pipelineContent: string | object) => {
5959
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/kbn_handlebars.yml'));
6060
}
6161

62-
if (GITHUB_PR_LABELS.includes('ci:hard-typecheck')) {
63-
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/type_check.yml'));
64-
} else {
65-
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/type_check_selective.yml'));
66-
}
67-
6862
if (
6963
(await doAnyChangesMatch([
7064
/^src\/plugins\/controls/,

‎.buildkite/scripts/steps/check_types_commits.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
set -euo pipefail
44

5+
# This script detects the files changed in a given set of commits, finds the related tsconfig.json files, and scope the TypeScript type check to those.
6+
# In CI, this script can be used for selective type-checking on projects that might be affected for a given PR.
7+
# (The accuracy for finding related projects is not a 100%)
8+
59
argv=( "$@" )
610
diffArgs=("--name-only")
711
uniq_dirs=()

0 commit comments

Comments
 (0)