Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,13 @@ export const schema = Joi.object()
// definition of apps that work with `common.navigateToApp()`
apps: Joi.object().pattern(ID_PATTERN, appUrlPartsSchema()).default(),

// settings for the saved objects svc
esArchiver: Joi.object()
.keys({
baseDirectory: Joi.string().optional(),
})
.default(),

// settings for the saved objects svc
kbnArchiver: Joi.object()
.keys({
Expand Down
1 change: 1 addition & 0 deletions test/common/services/es_archiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiv
const esArchives: string[] = config.get('testData.esArchives');

const esArchiver = new EsArchiver({
baseDir: config.get('esArchiver.baseDirectory'),
client,
log,
kbnClient: kibanaServer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { REPO_ROOT } from '@kbn/utils';
import chalk from 'chalk';
import { esTestConfig, kbnTestConfig } from '@kbn/test';
import { TriggersActionsPageProvider } from '../../functional_with_es_ssl/page_objects/triggers_actions_ui_page';
import { services } from '../services';

const log = new ToolingLog({
level: 'info',
Expand All @@ -28,13 +27,14 @@ export default async ({ readConfigFile }) => {
const xpackFunctionalConfig = await readConfigFile(
require.resolve('../../functional/config.base.js')
);
const externalConf = consumeState(resolve(__dirname, stateFilePath));
const externalConf = consumeState(resolve(__dirname, stateFilePath)) ?? {
TESTS_LIST: 'alerts',
};
process.env.stack_functional_integration = true;
logAll(log);

const settings = {
...xpackFunctionalConfig.getAll(),
services,
pageObjects: {
triggersActionsUI: TriggersActionsPageProvider,
...xpackFunctionalConfig.get('pageObjects'),
Expand All @@ -53,6 +53,9 @@ export default async ({ readConfigFile }) => {
...xpackFunctionalConfig.get('kbnTestServer'),
serverArgs: [...xpackFunctionalConfig.get('kbnTestServer.serverArgs')],
},
esArchiver: {
baseDirectory: INTEGRATION_TEST_ROOT,
},
testFiles: tests(externalConf.TESTS_LIST).map(prepend).map(logTest),
// testFiles: ['alerts'].map(prepend).map(logTest),
// If we need to do things like disable animations, we can do it in configure_start_kibana.sh, in the provisioner...which lives in the integration-test private repo
Expand Down
40 changes: 0 additions & 40 deletions x-pack/test/stack_functional_integration/services/es_archiver.js

This file was deleted.

14 changes: 0 additions & 14 deletions x-pack/test/stack_functional_integration/services/index.js

This file was deleted.