Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ftr/test_serverless] Use serverless.yml instead of undefined project #159272

Merged
merged 1 commit into from
Jun 8, 2023
Merged

[ftr/test_serverless] Use serverless.yml instead of undefined project #159272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion x-pack/test_serverless/api_integration/config.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/
import { resolve } from 'path';

import { REPO_ROOT } from '@kbn/repo-info';
import { FtrConfigProviderContext } from '@kbn/test';

import { services } from './services';
Expand All @@ -13,6 +15,7 @@ import type { CreateTestConfigOptions } from '../shared/types';
export function createTestConfig(options: CreateTestConfigOptions) {
return async ({ readConfigFile }: FtrConfigProviderContext) => {
const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts'));
const svlBaseConfig = resolve(REPO_ROOT, 'config', 'serverless.yml');

return {
...svlSharedConfig.getAll(),
Expand All @@ -22,7 +25,9 @@ export function createTestConfig(options: CreateTestConfigOptions) {
...svlSharedConfig.get('kbnTestServer'),
serverArgs: [
...svlSharedConfig.get('kbnTestServer.serverArgs'),
`--serverless${options.serverlessProject ? `=${options.serverlessProject}` : ''}`,
options.serverlessProject
? `--serverless=${options.serverlessProject}`
: `--config=${svlBaseConfig}`,
],
},
testFiles: options.testFiles,
Expand Down
6 changes: 5 additions & 1 deletion x-pack/test_serverless/functional/config.base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { resolve } from 'path';

import { REPO_ROOT } from '@kbn/repo-info';
import { FtrConfigProviderContext } from '@kbn/test';

import { pageObjects } from './page_objects';
Expand All @@ -16,6 +17,7 @@ import type { CreateTestConfigOptions } from '../shared/types';
export function createTestConfig(options: CreateTestConfigOptions) {
return async ({ readConfigFile }: FtrConfigProviderContext) => {
const svlSharedConfig = await readConfigFile(require.resolve('../shared/config.base.ts'));
const svlBaseConfig = resolve(REPO_ROOT, 'config', 'serverless.yml');

return {
...svlSharedConfig.getAll(),
Expand All @@ -26,7 +28,9 @@ export function createTestConfig(options: CreateTestConfigOptions) {
...svlSharedConfig.get('kbnTestServer'),
serverArgs: [
...svlSharedConfig.get('kbnTestServer.serverArgs'),
`--serverless${options.serverlessProject ? `=${options.serverlessProject}` : ''}`,
options.serverlessProject
? `--serverless=${options.serverlessProject}`
: `--config=${svlBaseConfig}`,
],
},
testFiles: options.testFiles,
Expand Down
1 change: 1 addition & 0 deletions x-pack/test_serverless/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
{ "path": "../test/tsconfig.json" },
"@kbn/expect",
"@kbn/test",
"@kbn/repo-info",
]
}