fix scalability config and config_path import

elastic · Sep 21, 2022 · f582cf8 · f582cf8
1 parent bf20987
commit f582cf8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/packages/kbn-test/src/functional_tests/lib/index.ts b/packages/kbn-test/src/functional_tests/lib/index.ts
@@ -9,4 +9,3 @@
 export { runKibanaServer } from './run_kibana_server';
 export { runElasticsearch } from './run_elasticsearch';
 export * from './run_ftr';
-export * from './config_path';
diff --git a/packages/kbn-test/src/functional_tests/start_servers/cli.ts b/packages/kbn-test/src/functional_tests/start_servers/cli.ts
@@ -18,8 +18,9 @@ import { startServers } from './start_servers';
  */
 export function startServersCli() {
   run(
-    async ({ flags, log }) => {
+    async ({ flagsReader: flags, log }) => {
       const options = parseFlags(flags);
+
       if (options.logsDir) {
         initLogsDir(log, options.logsDir);
       }

diff --git a/packages/kbn-test/src/functional_tests/start_servers/flags.ts b/packages/kbn-test/src/functional_tests/start_servers/flags.ts
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import { Flags } from '@kbn/dev-cli-runner';
+import { FlagsReader } from '@kbn/dev-cli-runner';
 import { createFlagError } from '@kbn/dev-cli-errors';
 
 import { parseFlags as parseRunTestFlags } from '../run_tests/flags';
 
 export type StartServerOptions = ReturnType<typeof parseFlags>;
 
-export function parseFlags(flags: Flags) {
+export function parseFlags(flags: FlagsReader) {
   const { configs, esFrom, esVersion, installDir, logsDir } = parseRunTestFlags(flags);
 
   if (configs.length !== 1) {

diff --git a/x-pack/test/scalability/config.ts b/x-pack/test/scalability/config.ts
@@ -22,10 +22,6 @@ const gatlingProjectRootPath: string =
   process.env.GATLING_PROJECT_PATH || path.resolve(REPO_ROOT, '../kibana-load-testing');
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const baseConfig = (
-    await readConfigFile(require.resolve('../functional/config.base.js'))
-  ).getAll();
-
   if (!fs.existsSync(gatlingProjectRootPath)) {
     throw createFlagError(
       `Incorrect path to load testing project: '${gatlingProjectRootPath}'\n
@@ -39,10 +35,15 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     );
   }
 
+  const baseConfig = (
+    await readConfigFile(require.resolve('../../performance/journeys/login.ts'))
+  ).getAll();
+
   return {
     ...baseConfig,
 
     services: commonFunctionalServices,
+    pageObjects: {},
 
     testRunner: (context: FtrProviderContext) =>
       ScalabilityTestRunner(context, scalabilityJsonPath, gatlingProjectRootPath),