Skip to content

Commit

Permalink
Merge branch '8.x' into backport/8.x/pr-201161
Browse files Browse the repository at this point in the history
  • Loading branch information
@elasticmachine
elasticmachine authored Nov 26, 2024
2 parents 0c19531 + aeb5d06 commit 888ac67
Show file tree
Hide file tree
Showing 1,502 changed files with 23,750 additions and 11,118 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_oblt_serverless_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ disabled:
- x-pack/test_serverless/functional/test_suites/observability/config.screenshots.ts
# serverless config files that run deployment-agnostic tests
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.serverless.config.ts
- x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.apm.serverless.config.ts

# Serverless tests only run on main
defaultQueue: 'n2-4-spot'
Expand Down
1 change: 1 addition & 0 deletions .buildkite/ftr_oblt_stateful_configs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ enabled:
- x-pack/test/functional/apps/apm/config.ts
# stateful configs that run deployment-agnostic tests
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.stateful.config.ts
- x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.apm.stateful.config.ts
243 changes: 105 additions & 138 deletions .buildkite/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .buildkite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@types/mocha": "^10.0.1",
"@types/node": "^15.12.2",
"chai": "^4.3.10",
"mocha": "^10.3.0",
"mocha": "^10.8.2",
"nock": "^12.0.2",
"ts-node": "^10.9.2",
"typescript": "^5.1.6"
Expand Down
Loading

0 comments on commit 888ac67

Please sign in to comment.