maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "chore(NA): rebalance x-pack cigroups (#85797)"

Browse source 
This reverts commit 1e3a483b06.
This commit is contained in:
Tyler Smalley 2020-12-16 15:28:53 -08:00
parent 2ea75487a6
commit c5e9543fc9
21 changed files with 55 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/es-snapshots/Jenkinsfile_verify_es
View file

@ -56,8 +56,6 @@ 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),
]),
])
}

2
.ci/jobs.yml
View file

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

2
test/functional/apps/visualize/index.ts
View file

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

4
test/scripts/jenkins_xpack_build_kibana.sh
View file

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

2
vars/kibanaCoverage.groovy
View file

@ -250,8 +250,6 @@ 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),
]
}

2
vars/tasks.groovy
View file

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

2
x-pack/test/api_integration_basic/apis/index.ts
View file

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

36
x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/index.ts
View file

@ -9,30 +9,18 @@ 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 () {
describe('', function () {
this.tags('ciGroup11');
this.tags('ciGroup11');
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'));
});
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'));
});
};

59
x-pack/test/detection_engine_api_integration/security_and_spaces/tests/index.ts
View file

@ -9,38 +9,33 @@ 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 () {
describe('', function () {
this.tags('ciGroup11');
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('./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'));
});
describe('', function () {
loadTestFile(require.resolve('./exception_operators_data_types/index'));
});
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'));
});
};

2
x-pack/test/encrypted_saved_objects_api_integration/tests/index.ts
View file

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

2
x-pack/test/functional/apps/api_keys/feature_controls/index.ts
View file

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

2
x-pack/test/functional/apps/cross_cluster_replication/feature_controls/index.ts
View file

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

2
x-pack/test/functional/apps/dev_tools/index.ts
View file

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

2
x-pack/test/functional/apps/grok_debugger/index.js
View file

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

2
x-pack/test/functional/apps/index_management/index.ts
View file

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

2
x-pack/test/functional_cors/tests/index.ts
View file

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

2
x-pack/test/licensing_plugin/public/index.ts
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('ciGroup5');
this.tags('ciGroup2');
loadTestFile(require.resolve('./feature_usage'));
// MUST BE LAST! CHANGES LICENSE TYPE!
loadTestFile(require.resolve('./updates'));

2
x-pack/test/plugin_api_integration/test_suites/event_log/index.ts
View file

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

2
x-pack/test/plugin_api_integration/test_suites/task_manager/index.ts
View file

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

2
x-pack/test/plugin_api_perf/test_suites/task_manager/index.ts
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('ciGroup12');
this.tags('ciGroup2');
loadTestFile(require.resolve('./task_manager_perf_integration'));
});
}

2
x-pack/test/plugin_functional/test_suites/global_search/index.ts
View file

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