mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 17:59:23 -04:00
# Backport This will backport the following commits from `main` to `8.9`: - [[ftr] split dashboard/group2/config into 2 configs (#160612)](https://github.com/elastic/kibana/pull/160612) <!--- 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-28T16:27:24Z","message":"[ftr] split dashboard/group2/config into 2 configs (#160612)\n\n## Summary\r\n\r\nSplitting `test/functional/apps/dashboard/group2/config.ts` as it\r\ngetting close to 35 minutes and quite often run on its own on CI worker.\r\n\r\n<img width=\"1713\" alt=\"image\"\r\nsrc=\"ac7f5dc6
-2a12-4057-af98-81ff53bac1c4\">`\r\n\r\nThis PR splits config into 2 almost run time equal groups:\r\n\r\n- test/functional/apps/dashboard/group2/config.ts 18m 31s\r\n- test/functional/apps/dashboard/group6/config.ts 16m 53s\r\n\r\nFlaky-test-runner for both configs:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2522","sha":"51fb80a226147d04cd4f9394e7e798e39ecf24e8","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":160612,"url":"https://github.com/elastic/kibana/pull/160612","mergeCommit":{"message":"[ftr] split dashboard/group2/config into 2 configs (#160612)\n\n## Summary\r\n\r\nSplitting `test/functional/apps/dashboard/group2/config.ts` as it\r\ngetting close to 35 minutes and quite often run on its own on CI worker.\r\n\r\n<img width=\"1713\" alt=\"image\"\r\nsrc=\"ac7f5dc6
-2a12-4057-af98-81ff53bac1c4\">`\r\n\r\nThis PR splits config into 2 almost run time equal groups:\r\n\r\n- test/functional/apps/dashboard/group2/config.ts 18m 31s\r\n- test/functional/apps/dashboard/group6/config.ts 16m 53s\r\n\r\nFlaky-test-runner for both configs:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2522","sha":"51fb80a226147d04cd4f9394e7e798e39ecf24e8"}},"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/160612","number":160612,"mergeCommit":{"message":"[ftr] split dashboard/group2/config into 2 configs (#160612)\n\n## Summary\r\n\r\nSplitting `test/functional/apps/dashboard/group2/config.ts` as it\r\ngetting close to 35 minutes and quite often run on its own on CI worker.\r\n\r\n<img width=\"1713\" alt=\"image\"\r\nsrc=\"ac7f5dc6
-2a12-4057-af98-81ff53bac1c4\">`\r\n\r\nThis PR splits config into 2 almost run time equal groups:\r\n\r\n- test/functional/apps/dashboard/group2/config.ts 18m 31s\r\n- test/functional/apps/dashboard/group6/config.ts 16m 53s\r\n\r\nFlaky-test-runner for both configs:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/2522","sha":"51fb80a226147d04cd4f9394e7e798e39ecf24e8"}}]}] BACKPORT--> Co-authored-by: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
This commit is contained in:
parent
0b6f2e89ce
commit
f1c113d998
10 changed files with 59 additions and 10 deletions
|
@ -111,6 +111,7 @@ enabled:
|
|||
- test/functional/apps/dashboard/group3/config.ts
|
||||
- test/functional/apps/dashboard/group4/config.ts
|
||||
- test/functional/apps/dashboard/group5/config.ts
|
||||
- test/functional/apps/dashboard/group6/config.ts
|
||||
- test/functional/apps/discover/ccs_compatibility/config.ts
|
||||
- test/functional/apps/discover/classic/config.ts
|
||||
- test/functional/apps/discover/embeddable/config.ts
|
||||
|
|
|
@ -30,14 +30,5 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
|
|||
loadTestFile(require.resolve('./dashboard_filter_bar'));
|
||||
loadTestFile(require.resolve('./dashboard_filtering'));
|
||||
loadTestFile(require.resolve('./panel_expand_toggle'));
|
||||
loadTestFile(require.resolve('./dashboard_grid'));
|
||||
loadTestFile(require.resolve('./view_edit'));
|
||||
loadTestFile(require.resolve('./dashboard_saved_query'));
|
||||
// Order of test suites *shouldn't* be important but there's a bug for the view_edit test above
|
||||
// https://github.com/elastic/kibana/issues/46752
|
||||
// The dashboard_snapshot test below requires the timestamped URL which breaks the view_edit test.
|
||||
// If we don't use the timestamp in the URL, the colors in the charts will be different.
|
||||
loadTestFile(require.resolve('./dashboard_snapshots'));
|
||||
loadTestFile(require.resolve('./embeddable_library'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
|
|||
await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
|
||||
}
|
||||
|
||||
describe('dashboard app - group 1', function () {
|
||||
describe('dashboard app - group 5', function () {
|
||||
before(loadCurrentData);
|
||||
after(unloadCurrentData);
|
||||
|
||||
|
|
18
test/functional/apps/dashboard/group6/config.ts
Normal file
18
test/functional/apps/dashboard/group6/config.ts
Normal file
|
@ -0,0 +1,18 @@
|
|||
/*
|
||||
* 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('.')],
|
||||
};
|
||||
}
|
39
test/functional/apps/dashboard/group6/index.ts
Normal file
39
test/functional/apps/dashboard/group6/index.ts
Normal file
|
@ -0,0 +1,39 @@
|
|||
/*
|
||||
* 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 esArchiver = getService('esArchiver');
|
||||
|
||||
async function loadCurrentData() {
|
||||
await browser.setWindowSize(1300, 900);
|
||||
await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
|
||||
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
|
||||
}
|
||||
|
||||
async function unloadCurrentData() {
|
||||
await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
|
||||
}
|
||||
|
||||
describe('dashboard app - group 6', function () {
|
||||
before(loadCurrentData);
|
||||
after(unloadCurrentData);
|
||||
|
||||
loadTestFile(require.resolve('./dashboard_grid'));
|
||||
loadTestFile(require.resolve('./view_edit'));
|
||||
loadTestFile(require.resolve('./dashboard_saved_query'));
|
||||
// Order of test suites *shouldn't* be important but there's a bug for the view_edit test above
|
||||
// https://github.com/elastic/kibana/issues/46752
|
||||
// The dashboard_snapshot test below requires the timestamped URL which breaks the view_edit test.
|
||||
// If we don't use the timestamp in the URL, the colors in the charts will be different.
|
||||
loadTestFile(require.resolve('./dashboard_snapshots'));
|
||||
loadTestFile(require.resolve('./embeddable_library'));
|
||||
});
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue