github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 17:59:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

[ftr] define default FTR services for serverless (#161946)

Browse source 
Cypress tests were failing with esArchiver service unavailability.

This PR fixes it by adding basic services (es, kibanaServier, esArchive
& retry) from `@kbn/ftr-common-functional-services` in shared FTR
configuration file. This way all the child config files will have these
services pre-loaded.

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Dzmitry Lemechko 2023-07-15 00:49:37 +02:00 • committed by GitHub
parent 16ae310a7f
commit 818efd2554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/test_serverless/functional/test_suites/security/cypress/security_config.base.ts
View file

@ -20,7 +20,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
...svlSharedConfig.get('esTestCluster.serverArgs'), ...svlSharedConfig.get('esTestCluster.serverArgs'),
// define custom es server here // define custom es server here
// API Keys is enabled at the top level // API Keys is enabled at the top level
'xpack.security.enabled=true',
], ],
}, },
kbnTestServer: { kbnTestServer: {

5
x-pack/test_serverless/shared/config.base.ts
View file

@ -10,6 +10,7 @@ import { format as formatUrl } from 'url';
import { REPO_ROOT } from '@kbn/repo-info'; import { REPO_ROOT } from '@kbn/repo-info';
import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test'; import { esTestConfig, kbnTestConfig, kibanaServerTestUser } from '@kbn/test';
import { commonFunctionalServices } from '@kbn/ftr-common-functional-services';
export default async () => { export default async () => {
const servers = { const servers = {
@ -66,6 +67,10 @@ export default async () => {
// Used by FTR to recognize serverless project and change its behavior accordingly // Used by FTR to recognize serverless project and change its behavior accordingly
serverless: true, serverless: true,
services: {
...commonFunctionalServices,
},
// overriding default timeouts from packages/kbn-test/src/functional_test_runner/lib/config/schema.ts // overriding default timeouts from packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
// so we can easily adjust them for serverless where needed // so we can easily adjust them for serverless where needed
timeouts: { timeouts: {

1
x-pack/test_serverless/tsconfig.json
View file

@ -26,5 +26,6 @@
"@kbn/telemetry-plugin", "@kbn/telemetry-plugin",
"@kbn/telemetry-collection-xpack-plugin", "@kbn/telemetry-collection-xpack-plugin",
"@kbn/telemetry-tools", "@kbn/telemetry-tools",
"@kbn/ftr-common-functional-services",
] ]
} }