chore(NA): create new x-pack cigroups and rebalancing them all (#88366)

* chore(NA): create new x-pack cigroups and rebalancing them all

* chore(NA): better cigroups balancing

* chore(NA): push rollup tests back into ciGroup1

* chore(NA): move some functional ml tests from cigroup3 into cigroup13

* chore(NA): move some more tests into ciGroup13

* chore(NA): use a single top level describe at x-pack/test/functional/apps/ml

* chore(NA): move settings into ciGroup13

* temporary test for es snapshots env

* Revert "temporary test for es snapshots env"

This reverts commit 789ebe7b9c.

* docs(NA): add missing documentation on the function tests describe split

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Tiago Costa 2021-01-20 13:47:08 +00:00 committed by GitHub
parent 55d4331a2b
commit 69182a8628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 166 additions and 102 deletions

View file

@ -56,6 +56,8 @@ kibanaPipeline(timeoutMinutes: 150) {
'xpack-ciGroup9': kibanaPipeline.xpackCiGroupProcess(9),
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
]),
])
}

View file

@ -32,6 +32,8 @@ JOB:
- x-pack-ciGroup9
- x-pack-ciGroup10
- x-pack-ciGroup11
- x-pack-ciGroup12
- x-pack-ciGroup13
- x-pack-accessibility
- x-pack-visualRegression

View file

@ -86,7 +86,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function () {
this.tags('ciGroup11');
this.tags('ciGroup4');
loadTestFile(require.resolve('./_line_chart_split_series'));
loadTestFile(require.resolve('./_line_chart_split_chart'));

View file

@ -23,7 +23,9 @@ node scripts/functional_tests --assert-none-excluded \
--include-tag ciGroup8 \
--include-tag ciGroup9 \
--include-tag ciGroup10 \
--include-tag ciGroup11
--include-tag ciGroup11 \
--include-tag ciGroup12 \
--include-tag ciGroup13
# Do not build kibana for code coverage run
if [[ -z "$CODE_COVERAGE" ]] ; then

View file

@ -247,6 +247,8 @@ def xpackProks() {
'xpack-ciGroup9' : kibanaPipeline.xpackCiGroupProcess(9),
'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10),
'xpack-ciGroup11': kibanaPipeline.xpackCiGroupProcess(11),
'xpack-ciGroup12': kibanaPipeline.xpackCiGroupProcess(12),
'xpack-ciGroup13': kibanaPipeline.xpackCiGroupProcess(13),
]
}

View file

@ -94,7 +94,7 @@ def functionalXpack(Map params = [:]) {
kibanaPipeline.buildXpack(10)
if (config.ciGroups) {
def ciGroups = 1..11
def ciGroups = 1..13
tasks(ciGroups.collect { kibanaPipeline.xpackCiGroupProcess(it) })
}

View file

@ -12,7 +12,7 @@ export default function alertingApiIntegrationTests({
getService,
}: FtrProviderContext) {
describe('alerting api integration basic license', function () {
this.tags('ciGroup3');
this.tags('ciGroup13');
loadTestFile(require.resolve('./actions'));
loadTestFile(require.resolve('./alerts'));

View file

@ -10,7 +10,7 @@ import { Spaces } from '../scenarios';
// eslint-disable-next-line import/no-default-export
export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
describe('alerting api integration spaces only', function () {
this.tags('ciGroup9');
this.tags('ciGroup12');
loadTestFile(require.resolve('./actions'));
loadTestFile(require.resolve('./alerting'));

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('apis', function () {
this.tags('ciGroup2');
this.tags('ciGroup11');
loadTestFile(require.resolve('./ml'));
loadTestFile(require.resolve('./transform'));

View file

@ -9,18 +9,30 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default ({ loadTestFile }: FtrProviderContext): void => {
describe('Detection exceptions data types and operators', function () {
this.tags('ciGroup11');
describe('', function () {
this.tags('ciGroup11');
loadTestFile(require.resolve('./date'));
loadTestFile(require.resolve('./double'));
loadTestFile(require.resolve('./float'));
loadTestFile(require.resolve('./integer'));
loadTestFile(require.resolve('./ip'));
loadTestFile(require.resolve('./ip_array'));
loadTestFile(require.resolve('./keyword'));
loadTestFile(require.resolve('./keyword_array'));
loadTestFile(require.resolve('./long'));
loadTestFile(require.resolve('./text'));
loadTestFile(require.resolve('./text_array'));
loadTestFile(require.resolve('./date'));
loadTestFile(require.resolve('./double'));
loadTestFile(require.resolve('./float'));
loadTestFile(require.resolve('./integer'));
});
describe('', function () {
this.tags('ciGroup12');
loadTestFile(require.resolve('./ip'));
loadTestFile(require.resolve('./ip_array'));
loadTestFile(require.resolve('./keyword'));
loadTestFile(require.resolve('./keyword_array'));
loadTestFile(require.resolve('./long'));
});
describe('', function () {
this.tags('ciGroup13');
loadTestFile(require.resolve('./text'));
loadTestFile(require.resolve('./text_array'));
});
});
};

View file

@ -9,33 +9,40 @@ import { FtrProviderContext } from '../../common/ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default ({ loadTestFile }: FtrProviderContext): void => {
describe('detection engine api security and spaces enabled', function () {
this.tags('ciGroup11');
describe('', function () {
this.tags('ciGroup11');
loadTestFile(require.resolve('./add_actions'));
loadTestFile(require.resolve('./add_prepackaged_rules'));
loadTestFile(require.resolve('./create_rules'));
loadTestFile(require.resolve('./create_rules_bulk'));
loadTestFile(require.resolve('./create_threat_matching'));
loadTestFile(require.resolve('./create_exceptions'));
loadTestFile(require.resolve('./delete_rules'));
loadTestFile(require.resolve('./delete_rules_bulk'));
loadTestFile(require.resolve('./exception_operators_data_types/index'));
loadTestFile(require.resolve('./export_rules'));
loadTestFile(require.resolve('./find_rules'));
loadTestFile(require.resolve('./find_statuses'));
loadTestFile(require.resolve('./generating_signals'));
loadTestFile(require.resolve('./get_prepackaged_rules_status'));
loadTestFile(require.resolve('./import_rules'));
loadTestFile(require.resolve('./read_rules'));
loadTestFile(require.resolve('./update_rules'));
loadTestFile(require.resolve('./update_rules_bulk'));
loadTestFile(require.resolve('./patch_rules_bulk'));
loadTestFile(require.resolve('./patch_rules'));
loadTestFile(require.resolve('./query_signals'));
loadTestFile(require.resolve('./open_close_signals'));
loadTestFile(require.resolve('./get_signals_migration_status'));
loadTestFile(require.resolve('./create_signals_migrations'));
loadTestFile(require.resolve('./finalize_signals_migrations'));
loadTestFile(require.resolve('./delete_signals_migrations'));
loadTestFile(require.resolve('./add_actions'));
loadTestFile(require.resolve('./add_prepackaged_rules'));
loadTestFile(require.resolve('./create_rules'));
loadTestFile(require.resolve('./create_rules_bulk'));
loadTestFile(require.resolve('./create_threat_matching'));
loadTestFile(require.resolve('./create_exceptions'));
loadTestFile(require.resolve('./delete_rules'));
loadTestFile(require.resolve('./delete_rules_bulk'));
loadTestFile(require.resolve('./export_rules'));
loadTestFile(require.resolve('./find_rules'));
loadTestFile(require.resolve('./find_statuses'));
loadTestFile(require.resolve('./generating_signals'));
loadTestFile(require.resolve('./get_prepackaged_rules_status'));
loadTestFile(require.resolve('./import_rules'));
loadTestFile(require.resolve('./read_rules'));
loadTestFile(require.resolve('./update_rules'));
loadTestFile(require.resolve('./update_rules_bulk'));
loadTestFile(require.resolve('./patch_rules_bulk'));
loadTestFile(require.resolve('./patch_rules'));
loadTestFile(require.resolve('./query_signals'));
loadTestFile(require.resolve('./open_close_signals'));
loadTestFile(require.resolve('./get_signals_migration_status'));
loadTestFile(require.resolve('./create_signals_migrations'));
loadTestFile(require.resolve('./finalize_signals_migrations'));
loadTestFile(require.resolve('./delete_signals_migrations'));
});
// That split here enable us on using a different ciGroup to run the tests
// listed on ./exception_operators_data_types/index
describe('', function () {
loadTestFile(require.resolve('./exception_operators_data_types/index'));
});
});
};

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('encryptedSavedObjects', function encryptedSavedObjectsSuite() {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./encrypted_saved_objects_api'));
});
}

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('feature controls', function () {
this.tags(['ciGroup2']);
this.tags(['ciGroup8']);
loadTestFile(require.resolve('./api_keys_security'));
});

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('feature controls', function () {
this.tags(['ciGroup2']);
this.tags(['ciGroup8']);
loadTestFile(require.resolve('./ccr_security'));
});

View file

@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('console', function () {
this.tags('ciGroup10');
this.tags('ciGroup13');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./searchprofiler_editor'));

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('graph app', function () {
this.tags('ciGroup1');
this.tags('ciGroup12');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./graph'));

View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('logstash', function () {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./grok_debugger'));
});

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext) => {
describe('Index Management app', function () {
this.tags('ciGroup3');
this.tags('ciGroup13');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./home_page'));
});

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext) => {
describe('Ingest pipelines app', function () {
this.tags('ciGroup3');
this.tags('ciGroup13');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./ingest_pipelines'));
});

View file

@ -10,44 +10,81 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const ml = getService('ml');
describe('machine learning', function () {
this.tags('ciGroup3');
describe('', function () {
this.tags('ciGroup3');
before(async () => {
await ml.securityCommon.createMlRoles();
await ml.securityCommon.createMlUsers();
before(async () => {
await ml.securityCommon.createMlRoles();
await ml.securityCommon.createMlUsers();
});
after(async () => {
await ml.securityCommon.cleanMlUsers();
await ml.securityCommon.cleanMlRoles();
await ml.testResources.deleteSavedSearches();
await ml.testResources.deleteDashboards();
await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
await ml.testResources.deleteIndexPatternByTitle('ft_ecommerce');
await ml.testResources.deleteIndexPatternByTitle('ft_categorization');
await ml.testResources.deleteIndexPatternByTitle('ft_event_rate_gen_trend_nanos');
await ml.testResources.deleteIndexPatternByTitle('ft_bank_marketing');
await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression');
await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
await esArchiver.unload('ml/farequote');
await esArchiver.unload('ml/ecommerce');
await esArchiver.unload('ml/categorization');
await esArchiver.unload('ml/event_rate_nanos');
await esArchiver.unload('ml/bm_classification');
await esArchiver.unload('ml/ihp_outlier');
await esArchiver.unload('ml/egs_regression');
await esArchiver.unload('ml/module_sample_ecommerce');
await ml.testResources.resetKibanaTimeZone();
await ml.securityUI.logout();
});
loadTestFile(require.resolve('./permissions'));
loadTestFile(require.resolve('./pages'));
loadTestFile(require.resolve('./anomaly_detection'));
loadTestFile(require.resolve('./data_visualizer'));
loadTestFile(require.resolve('./data_frame_analytics'));
});
after(async () => {
await ml.securityCommon.cleanMlUsers();
await ml.securityCommon.cleanMlRoles();
await ml.testResources.deleteSavedSearches();
await ml.testResources.deleteDashboards();
await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
await ml.testResources.deleteIndexPatternByTitle('ft_ecommerce');
await ml.testResources.deleteIndexPatternByTitle('ft_categorization');
await ml.testResources.deleteIndexPatternByTitle('ft_event_rate_gen_trend_nanos');
await ml.testResources.deleteIndexPatternByTitle('ft_bank_marketing');
await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression');
await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
await esArchiver.unload('ml/farequote');
await esArchiver.unload('ml/ecommerce');
await esArchiver.unload('ml/categorization');
await esArchiver.unload('ml/event_rate_nanos');
await esArchiver.unload('ml/bm_classification');
await esArchiver.unload('ml/ihp_outlier');
await esArchiver.unload('ml/egs_regression');
await esArchiver.unload('ml/module_sample_ecommerce');
await ml.testResources.resetKibanaTimeZone();
await ml.securityUI.logout();
});
describe('', function () {
this.tags('ciGroup13');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./permissions'));
loadTestFile(require.resolve('./pages'));
loadTestFile(require.resolve('./anomaly_detection'));
loadTestFile(require.resolve('./data_visualizer'));
loadTestFile(require.resolve('./data_frame_analytics'));
loadTestFile(require.resolve('./settings'));
before(async () => {
await ml.securityCommon.createMlRoles();
await ml.securityCommon.createMlUsers();
});
after(async () => {
await ml.securityCommon.cleanMlUsers();
await ml.securityCommon.cleanMlRoles();
await ml.testResources.deleteSavedSearches();
await ml.testResources.deleteDashboards();
await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
await ml.testResources.deleteIndexPatternByTitle('ft_ecommerce');
await ml.testResources.deleteIndexPatternByTitle('ft_categorization');
await ml.testResources.deleteIndexPatternByTitle('ft_event_rate_gen_trend_nanos');
await ml.testResources.deleteIndexPatternByTitle('ft_bank_marketing');
await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression');
await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
await esArchiver.unload('ml/farequote');
await esArchiver.unload('ml/ecommerce');
await esArchiver.unload('ml/categorization');
await esArchiver.unload('ml/event_rate_nanos');
await esArchiver.unload('ml/bm_classification');
await esArchiver.unload('ml/ihp_outlier');
await esArchiver.unload('ml/egs_regression');
await esArchiver.unload('ml/module_sample_ecommerce');
await ml.testResources.resetKibanaTimeZone();
await ml.securityUI.logout();
});
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./settings'));
});
});
}

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Kibana cors', function () {
this.tags('ciGroup2');
this.tags('ciGroup12');
loadTestFile(require.resolve('./cors'));
});
}

View file

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../services';
// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Licensing plugin public client', function () {
this.tags('ciGroup2');
this.tags('ciGroup5');
loadTestFile(require.resolve('./feature_usage'));
// MUST BE LAST! CHANGES LICENSE TYPE!
loadTestFile(require.resolve('./updates'));

View file

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../services';
// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Licensing plugin server client', function () {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./info'));
loadTestFile(require.resolve('./header'));

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('event_log', function taskManagerSuite() {
this.tags('ciGroup2');
this.tags('ciGroup6');
loadTestFile(require.resolve('./public_api_integration'));
loadTestFile(require.resolve('./service_api_integration'));
});

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Licensed feature usage APIs', function () {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./feature_usage'));
});
}

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('platform', function taskManagerSuite() {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./elasticsearch_client'));
});
}

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('task_manager', function taskManagerSuite() {
this.tags('ciGroup2');
this.tags('ciGroup12');
loadTestFile(require.resolve('./health_route'));
loadTestFile(require.resolve('./task_management'));
loadTestFile(require.resolve('./task_management_removed_types'));

View file

@ -14,7 +14,7 @@ export default function ({ loadTestFile }: { loadTestFile: (file: string) => voi
* worth keeping around for future use, rather than being rewritten time and time again.
*/
describe.skip('task_manager_perf', function taskManagerSuite() {
this.tags('ciGroup2');
this.tags('ciGroup12');
loadTestFile(require.resolve('./task_manager_perf_integration'));
});
}

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('GlobalSearch API', function () {
this.tags('ciGroup10');
this.tags('ciGroup7');
loadTestFile(require.resolve('./global_search_providers'));
loadTestFile(require.resolve('./global_search_bar'));
});

View file

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile }: FtrProviderContext) {
describe('Reporting APIs', function () {
this.tags('ciGroup2');
this.tags('ciGroup13');
loadTestFile(require.resolve('./job_apis'));
loadTestFile(require.resolve('./management'));
});

View file

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../services';
// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile }: FtrProviderContext) {
describe('saved objects tagging API', function () {
this.tags('ciGroup10');
this.tags('ciGroup12');
loadTestFile(require.resolve('./delete'));
loadTestFile(require.resolve('./create'));

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security app - login selector', function () {
this.tags('ciGroup4');
this.tags('ciGroup13');
loadTestFile(require.resolve('./basic_functionality'));
loadTestFile(require.resolve('./auth_provider_hint'));

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security app - OIDC interactions', function () {
this.tags('ciGroup4');
this.tags('ciGroup13');
loadTestFile(require.resolve('./url_capture'));
});

View file

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security app - SAML interactions', function () {
this.tags('ciGroup4');
this.tags('ciGroup13');
loadTestFile(require.resolve('./url_capture'));
});