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

[8.9] [ftr] split dashboard_elements/config to speedup CI run (#160550) (#160767)

Browse source 
# Backport

This will backport the following commits from `main` to `8.9`:
- [[ftr] split dashboard_elements/config to speedup CI run
(#160550)](https://github.com/elastic/kibana/pull/160550)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Dzmitry
Lemechko","email":"dzmitry.lemechko@elastic.co"},"sourceCommit":{"committedDate":"2023-06-28T15:00:34Z","message":"[ftr]
split dashboard_elements/config to speedup CI run (#160550)\n\n##
Summary\r\n\r\nSplitting FTR config as it consistently takes over 37
minutes to run.\r\n\r\nThis PR splits it into 5 smaller
configs:\r\n\r\n-
test/functional/apps/dashboard_elements/controls/common/config.ts
15m\r\n24s\r\n-\r\ntest/functional/apps/dashboard_elements/controls/options_list/config.ts\r\n17m
38s\r\n-
test/functional/apps/dashboard_elements/image_embeddable/config.ts
2m\r\n14s\r\n-
test/functional/apps/dashboard_elements/input_control_vis/config.ts
4m\r\n41s\r\n-
test/functional/apps/dashboard_elements/markdown/config.ts 1m
24s","sha":"599bbacab048359d87f17072a4920d96de8ba087","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v8.9.0","v8.8.2","v8.10.0"],"number":160550,"url":"https://github.com/elastic/kibana/pull/160550","mergeCommit":{"message":"[ftr]
split dashboard_elements/config to speedup CI run (#160550)\n\n##
Summary\r\n\r\nSplitting FTR config as it consistently takes over 37
minutes to run.\r\n\r\nThis PR splits it into 5 smaller
configs:\r\n\r\n-
test/functional/apps/dashboard_elements/controls/common/config.ts
15m\r\n24s\r\n-\r\ntest/functional/apps/dashboard_elements/controls/options_list/config.ts\r\n17m
38s\r\n-
test/functional/apps/dashboard_elements/image_embeddable/config.ts
2m\r\n14s\r\n-
test/functional/apps/dashboard_elements/input_control_vis/config.ts
4m\r\n41s\r\n-
test/functional/apps/dashboard_elements/markdown/config.ts 1m
24s","sha":"599bbacab048359d87f17072a4920d96de8ba087"}},"sourceBranch":"main","suggestedTargetBranches":["8.9","8.8"],"targetPullRequestStates":[{"branch":"8.9","label":"v8.9.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.8","label":"v8.8.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/160550","number":160550,"mergeCommit":{"message":"[ftr]
split dashboard_elements/config to speedup CI run (#160550)\n\n##
Summary\r\n\r\nSplitting FTR config as it consistently takes over 37
minutes to run.\r\n\r\nThis PR splits it into 5 smaller
configs:\r\n\r\n-
test/functional/apps/dashboard_elements/controls/common/config.ts
15m\r\n24s\r\n-\r\ntest/functional/apps/dashboard_elements/controls/options_list/config.ts\r\n17m
38s\r\n-
test/functional/apps/dashboard_elements/image_embeddable/config.ts
2m\r\n14s\r\n-
test/functional/apps/dashboard_elements/input_control_vis/config.ts
4m\r\n41s\r\n-
test/functional/apps/dashboard_elements/markdown/config.ts 1m
24s","sha":"599bbacab048359d87f17072a4920d96de8ba087"}}]}] BACKPORT-->

Co-authored-by: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
This commit is contained in:
Kibana Machine 2023-06-28 12:13:19 -04:00 • committed by GitHub
parent 613f47d564
commit 8840872584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 137 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.buildkite/ftr_configs.yml
View file

@ -101,7 +101,11 @@ enabled:
- test/functional/apps/bundles/config.ts
- test/functional/apps/console/config.ts
- test/functional/apps/context/config.ts
- test/functional/apps/dashboard_elements/config.ts
- test/functional/apps/dashboard_elements/controls/common/config.ts
- test/functional/apps/dashboard_elements/controls/options_list/config.ts
- test/functional/apps/dashboard_elements/image_embeddable/config.ts
- test/functional/apps/dashboard_elements/input_control_vis/config.ts
- test/functional/apps/dashboard_elements/markdown/config.ts
- test/functional/apps/dashboard/group1/config.ts
- test/functional/apps/dashboard/group2/config.ts
- test/functional/apps/dashboard/group3/config.ts

5
test/functional/apps/dashboard_elements/config.ts → test/functional/apps/dashboard_elements/controls/common/config.ts
View file

@ -9,10 +9,13 @@
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../config.base.js'));
const functionalConfig = await readConfigFile(require.resolve('../../../../config.base.js'));
return {
...functionalConfig.getAll(),
testFiles: [require.resolve('.')],
junit: {
reportName: 'Dashboard Elements - Controls tests',
},
};
}

4
test/functional/apps/dashboard_elements/controls/control_group_chaining.ts → test/functional/apps/dashboard_elements/controls/common/control_group_chaining.ts
View file

@ -11,8 +11,8 @@ import { pick } from 'lodash';
import expect from '@kbn/expect';
import { OPTIONS_LIST_CONTROL } from '@kbn/controls-plugin/common';
import { OPTIONS_LIST_ANIMAL_SOUND_SUGGESTIONS } from '../../../page_objects/dashboard_page_controls';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { OPTIONS_LIST_ANIMAL_SOUND_SUGGESTIONS } from '../../../../page_objects/dashboard_page_controls';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const retry = getService('retry');

2
test/functional/apps/dashboard_elements/controls/control_group_settings.ts → test/functional/apps/dashboard_elements/controls/common/control_group_settings.ts
View file

@ -9,7 +9,7 @@
import { OPTIONS_LIST_CONTROL } from '@kbn/controls-plugin/common';
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');

3
test/functional/apps/dashboard_elements/controls/index.ts → test/functional/apps/dashboard_elements/controls/common/index.ts
View file

@ -6,7 +6,7 @@
* Side Public License, v 1.
*/
import { FtrProviderContext } from '../../../ftr_provider_context';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ loadTestFile, getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
@ -47,7 +47,6 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
before(setup);
after(teardown);
loadTestFile(require.resolve('./control_group_settings'));
loadTestFile(require.resolve('./options_list'));
loadTestFile(require.resolve('./range_slider'));
loadTestFile(require.resolve('./time_slider'));
loadTestFile(require.resolve('./control_group_chaining'));

2
test/functional/apps/dashboard_elements/controls/range_slider.ts → test/functional/apps/dashboard_elements/controls/common/range_slider.ts
View file

@ -9,7 +9,7 @@
import { RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const retry = getService('retry');

2
test/functional/apps/dashboard_elements/controls/replace_controls.ts → test/functional/apps/dashboard_elements/controls/common/replace_controls.ts
View file

@ -9,7 +9,7 @@
import expect from '@kbn/expect';
import { OPTIONS_LIST_CONTROL, RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const testSubjects = getService('testSubjects');

2
test/functional/apps/dashboard_elements/controls/time_slider.ts → test/functional/apps/dashboard_elements/controls/common/time_slider.ts
View file

@ -9,7 +9,7 @@
import { RANGE_SLIDER_CONTROL } from '@kbn/controls-plugin/common';
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../../ftr_provider_context';
import { FtrProviderContext } from '../../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const esArchiver = getService('esArchiver');

21
test/functional/apps/dashboard_elements/controls/options_list/config.ts Normal file
View file

@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../../config.base.js'));
return {
...functionalConfig.getAll(),
testFiles: [require.resolve('.')],
junit: {
reportName: 'Dashboard Elements - Controls Options List tests',
},
};
}

12
test/functional/apps/dashboard_elements/controls/options_list/index.ts
View file

@ -12,12 +12,22 @@ export const OPTIONS_LIST_DASHBOARD_NAME = 'Test Options List Control';
export default function ({ loadTestFile, getService, getPageObjects }: FtrProviderContext) {
const elasticChart = getService('elasticChart');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const security = getService('security');
const { timePicker, dashboard, common } = getPageObjects(['timePicker', 'dashboard', 'common']);
const setup = async () => {
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
await kibanaServer.savedObjects.cleanStandardList();
await kibanaServer.importExport.load(
'test/functional/fixtures/kbn_archiver/dashboard/current/kibana'
);
await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
await kibanaServer.uiSettings.replace({
defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
});
await common.navigateToApp('dashboard');
await dashboard.gotoDashboardLandingPage();
@ -31,7 +41,9 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
};
const teardown = async () => {
await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
await security.testUser.restoreDefaults();
await kibanaServer.savedObjects.cleanStandardList();
};
describe('Options list control', async () => {

21
test/functional/apps/dashboard_elements/image_embeddable/config.ts Normal file
View file

@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
return {
...functionalConfig.getAll(),
testFiles: [require.resolve('.')],
junit: {
reportName: 'Dashboard Elements - Image Embeddable tests',
},
};
}

40
test/functional/apps/dashboard_elements/index.ts
View file

@ -1,40 +0,0 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
describe('dashboard elements', () => {
before(async () => {
log.debug('Starting before method');
await browser.setWindowSize(1280, 800);
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
});
after(async () => {
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.unload('test/functional/fixtures/es_archiver/long_window_logstash');
});
describe('dashboard elements', function () {
loadTestFile(require.resolve('./input_control_vis'));
loadTestFile(require.resolve('./controls'));
loadTestFile(require.resolve('./_markdown_vis'));
loadTestFile(require.resolve('./image_embeddable'));
});
});
}

21
test/functional/apps/dashboard_elements/input_control_vis/config.ts Normal file
View file

@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
return {
...functionalConfig.getAll(),
testFiles: [require.resolve('.')],
junit: {
reportName: 'Dashboard Elements - Input Controls tests',
},
};
}

20
test/functional/apps/dashboard_elements/input_control_vis/index.ts
View file

@ -8,8 +8,26 @@
import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
describe('input controls', function () {
before(async () => {
await browser.setWindowSize(1280, 800);
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
});
after(async () => {
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.unload('test/functional/fixtures/es_archiver/long_window_logstash');
});
loadTestFile(require.resolve('./input_control_options'));
loadTestFile(require.resolve('./dynamic_options'));
loadTestFile(require.resolve('./chained_controls'));

2
test/functional/apps/dashboard_elements/_markdown_vis.ts → test/functional/apps/dashboard_elements/markdown/_markdown_vis.ts
View file

@ -8,7 +8,7 @@
import expect from '@kbn/expect';
import { FtrProviderContext } from '../../ftr_provider_context';
import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ getService, getPageObjects }: FtrProviderContext) {
const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'header']);

21
test/functional/apps/dashboard_elements/markdown/config.ts Normal file
View file

@ -0,0 +1,21 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/
import { FtrConfigProviderContext } from '@kbn/test';
export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
return {
...functionalConfig.getAll(),
testFiles: [require.resolve('./_markdown_vis')],
junit: {
reportName: 'Dashboard Elements - Markdown tests',
},
};
}

6
test/functional/firefox/dashboard.config.ts
View file

@ -18,7 +18,11 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
testFiles: [
require.resolve('../apps/dashboard/group4/dashboard_save'),
require.resolve('../apps/dashboard_elements'),
require.resolve('../apps/dashboard_elements/controls/common'),
require.resolve('../apps/dashboard_elements/controls/options_list'),
require.resolve('../apps/dashboard_elements/image_embeddable'),
require.resolve('../apps/dashboard_elements/input_control_vis'),
require.resolve('../apps/dashboard_elements/markdown/_markdown_vis.ts'),
],
junit: {