Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 17 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
2 changes: 2 additions & 0 deletions .ci/es-snapshots/Jenkinsfile_verify_es
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]),
])
}
Expand Down
2 changes: 2 additions & 0 deletions .ci/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
34 changes: 19 additions & 15 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@
library 'kibana-pipeline-library'
kibanaLibrary.load()

kibanaPipeline(timeoutMinutes: 155, checkPrChanges: true, setCommitStatus: true) {
slackNotifications.onFailure(disabled: !params.NOTIFY_ON_FAILURE) {
githubPr.withDefaultPrComments {
ciStats.trackBuild {
catchError {
retryable.enable()
kibanaPipeline.allCiTasks()
}
}
}
}

if (params.NOTIFY_ON_FAILURE) {
kibanaPipeline.sendMail()
}
kibanaPipeline(timeoutMinutes: 150) {
mistic marked this conversation as resolved.
Show resolved Hide resolved
retryable.enable(1)
parallel([
'kibana-xpack-agent': workers.functional('kibana-xpack-tests', { kibanaPipeline.buildXpack() }, [
'xpack-ciGroup1': kibanaPipeline.xpackCiGroupProcess(1),
'xpack-ciGroup2': kibanaPipeline.xpackCiGroupProcess(2),
'xpack-ciGroup3': kibanaPipeline.xpackCiGroupProcess(3),
'xpack-ciGroup4': kibanaPipeline.xpackCiGroupProcess(4),
'xpack-ciGroup5': kibanaPipeline.xpackCiGroupProcess(5),
'xpack-ciGroup6': kibanaPipeline.xpackCiGroupProcess(6),
'xpack-ciGroup7': kibanaPipeline.xpackCiGroupProcess(7),
'xpack-ciGroup8': kibanaPipeline.xpackCiGroupProcess(8),
'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 changes: 1 addition & 1 deletion test/functional/apps/visualize/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,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'));
Expand Down
4 changes: 3 additions & 1 deletion test/scripts/jenkins_xpack_build_kibana.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions vars/kibanaCoverage.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]
}

Expand Down
2 changes: 1 addition & 1 deletion vars/tasks.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,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) })
}

Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/alerting_api_integration/basic/tests/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/api_integration_basic/apis/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,38 @@ 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'));
});

describe('', function () {
loadTestFile(require.resolve('./exception_operators_data_types/index'));
});
mistic marked this conversation as resolved.
Show resolved Hide resolved
});
};
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/dev_tools/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/graph/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/grok_debugger/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

export default function ({ loadTestFile }) {
describe('logstash', function () {
this.tags('ciGroup2');
this.tags('ciGroup13');

loadTestFile(require.resolve('./grok_debugger'));
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/index_management/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/ingest_pipelines/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down
Loading