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

Revert "[CI] Rebalance/split cigroups and speed up overall CI time (#113676)"

Browse source 
This reverts commit 9888b7fec3.
This commit is contained in:
Brian Seeders 2021-11-10 10:34:38 -05:00
parent 9888b7fec3
commit 30de97bc2d
No known key found for this signature in database
GPG key ID: 424927146CC9A682
28 changed files with 60 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.buildkite/pipelines/es_snapshots/verify.yml
View file

@ -29,7 +29,7 @@ steps:
label: 'Default CI Group'
parallelism: 13
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 150
key: default-cigroup
@ -41,7 +41,7 @@ steps:
- command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
label: 'Docker CI Group'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
key: default-cigroup-docker
@ -77,7 +77,7 @@ steps:
- command: .buildkite/scripts/steps/test/api_integration.sh
label: 'API Integration Tests'
agents:
queue: n2-2
queue: jest
timeout_in_minutes: 120
key: api-integration

6
.buildkite/pipelines/flaky_tests/runner.js
View file

@ -78,7 +78,7 @@ for (const testSuite of testSuites) {
steps.push({
command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/xpack_cigroup.sh`,
label: `Default CI Group ${CI_GROUP}`,
agents: { queue: 'n2-4' },
agents: { queue: 'ci-group-6' },
depends_on: 'build',
parallelism: RUN_COUNT,
concurrency: concurrency,
@ -103,7 +103,7 @@ for (const testSuite of testSuites) {
steps.push({
command: `.buildkite/scripts/steps/functional/${IS_XPACK ? 'xpack' : 'oss'}_firefox.sh`,
label: `${IS_XPACK ? 'Default' : 'OSS'} Firefox`,
agents: { queue: IS_XPACK ? 'n2-4' : 'ci-group-4d' },
agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
depends_on: 'build',
parallelism: RUN_COUNT,
concurrency: concurrency,
@ -118,7 +118,7 @@ for (const testSuite of testSuites) {
IS_XPACK ? 'xpack' : 'oss'
}_accessibility.sh`,
label: `${IS_XPACK ? 'Default' : 'OSS'} Accessibility`,
agents: { queue: IS_XPACK ? 'n2-4' : 'ci-group-4d' },
agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
depends_on: 'build',
parallelism: RUN_COUNT,
concurrency: concurrency,

12
.buildkite/pipelines/hourly.yml
View file

@ -19,7 +19,7 @@ steps:
label: 'Default CI Group'
parallelism: 13
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 250
key: default-cigroup
@ -31,7 +31,7 @@ steps:
- command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
label: 'Docker CI Group'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
key: default-cigroup-docker
@ -67,7 +67,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
label: 'Default Accessibility Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -89,7 +89,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_firefox.sh
label: 'Default Firefox Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -100,7 +100,7 @@ steps:
- command: .buildkite/scripts/steps/functional/oss_misc.sh
label: 'OSS Misc Functional Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -111,7 +111,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
label: 'Saved Object Field Metrics'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:

16
.buildkite/pipelines/pull_request/base.yml
View file

@ -15,9 +15,9 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_cigroup.sh
label: 'Default CI Group'
parallelism: 27
parallelism: 13
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 150
key: default-cigroup
@ -29,7 +29,7 @@ steps:
- command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
label: 'Docker CI Group'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
key: default-cigroup-docker
@ -65,7 +65,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
label: 'Default Accessibility Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -87,7 +87,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_firefox.sh
label: 'Default Firefox Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -98,7 +98,7 @@ steps:
- command: .buildkite/scripts/steps/functional/oss_misc.sh
label: 'OSS Misc Functional Tests'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -109,7 +109,7 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
label: 'Saved Object Field Metrics'
agents:
queue: n2-4
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
@ -156,7 +156,7 @@ steps:
- command: .buildkite/scripts/steps/checks.sh
label: 'Checks'
agents:
queue: c2-8
queue: c2-4
key: checks
timeout_in_minutes: 120

24
.buildkite/scripts/steps/checks/type_check_plugin_public_api_docs.sh
View file

@ -11,27 +11,9 @@ checks-reporter-with-killswitch "Build TS Refs" \
--no-cache \
--force
checks-reporter-with-killswitch "Check Types" \
node scripts/type_check &> target/check_types.log &
check_types_pid=$!
node --max-old-space-size=12000 scripts/build_api_docs &> target/build_api_docs.log &
api_docs_pid=$!
wait $check_types_pid
check_types_exit=$?
wait $api_docs_pid
api_docs_exit=$?
echo --- Check Types
cat target/check_types.log
if [[ "$check_types_exit" != "0" ]]; then echo "^^^ +++"; fi
checks-reporter-with-killswitch "Check Types" \
node scripts/type_check
echo --- Building api docs
cat target/build_api_docs.log
if [[ "$api_docs_exit" != "0" ]]; then echo "^^^ +++"; fi
if [[ "${api_docs_exit}${check_types_exit}" != "00" ]]; then
exit 1
fi
node --max-old-space-size=12000 scripts/build_api_docs

14
.ci/ci_groups.yml
View file

@ -25,18 +25,4 @@ xpack:
- ciGroup11
- ciGroup12
- ciGroup13
- ciGroup14
- ciGroup15
- ciGroup16
- ciGroup17
- ciGroup18
- ciGroup19
- ciGroup20
- ciGroup21
- ciGroup22
- ciGroup23
- ciGroup24
- ciGroup25
- ciGroup26
- ciGroup27
- ciGroupDocker

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

@ -22,7 +22,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function () {
this.tags('ciGroup9');
this.tags('ciGroup7');
loadTestFile(require.resolve('./_create_index_pattern_wizard'));
loadTestFile(require.resolve('./_index_pattern_create_delete'));

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

@ -74,8 +74,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_metric_chart'));
});
describe('visualize ciGroup1', function () {
this.tags('ciGroup1');
describe('visualize ciGroup4', function () {
this.tags('ciGroup4');
loadTestFile(require.resolve('./_pie_chart'));
loadTestFile(require.resolve('./_shared_item'));

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

@ -58,7 +58,7 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
// eslint-disable-next-line import/no-default-export
export default function alertingApiIntegrationTests({ loadTestFile }: FtrProviderContext) {
describe('alerting api integration security and spaces enabled', function () {
this.tags('ciGroup17');
this.tags('ciGroup5');
loadTestFile(require.resolve('./actions'));
loadTestFile(require.resolve('./alerting'));

4
x-pack/test/api_integration/apis/index.ts
View file

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('apis', function () {
this.tags('ciGroup18');
this.tags('ciGroup6');
loadTestFile(require.resolve('./search'));
loadTestFile(require.resolve('./es'));
@ -27,12 +27,12 @@ export default function ({ loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./maps'));
loadTestFile(require.resolve('./security_solution'));
loadTestFile(require.resolve('./lens'));
loadTestFile(require.resolve('./ml'));
loadTestFile(require.resolve('./transform'));
loadTestFile(require.resolve('./lists'));
loadTestFile(require.resolve('./upgrade_assistant'));
loadTestFile(require.resolve('./searchprofiler'));
loadTestFile(require.resolve('./painless_lab'));
loadTestFile(require.resolve('./file_upload'));
loadTestFile(require.resolve('./ml'));
});
}

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security', function () {
this.tags('ciGroup18');
this.tags('ciGroup6');
// Updates here should be mirrored in `./security_basic.ts` if tests
// should also run under a basic license.

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('spaces', function () {
this.tags('ciGroup18');
this.tags('ciGroup6');
loadTestFile(require.resolve('./get_active_space'));
loadTestFile(require.resolve('./saved_objects'));

2
x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
View file

@ -12,7 +12,7 @@ import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/
export default ({ loadTestFile, getService }: FtrProviderContext): void => {
describe('cases security and spaces enabled: basic', function () {
// Fastest ciGroup for the moment.
this.tags('ciGroup27');
this.tags('ciGroup13');
before(async () => {
await createSpacesAndUsers(getService);

3
x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
View file

@ -11,7 +11,8 @@ import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/
// eslint-disable-next-line import/no-default-export
export default ({ loadTestFile, getService }: FtrProviderContext): void => {
describe('cases security and spaces enabled: trial', function () {
this.tags('ciGroup25');
// Fastest ciGroup for the moment.
this.tags('ciGroup13');
before(async () => {
await createSpacesAndUsers(getService);

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

@ -11,7 +11,7 @@ import { FtrProviderContext } from '../../../common/ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext): void => {
describe('Detection exceptions data types and operators', function () {
describe('', function () {
this.tags('ciGroup23');
this.tags('ciGroup11');
loadTestFile(require.resolve('./date'));
loadTestFile(require.resolve('./double'));
@ -20,7 +20,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
});
describe('', function () {
this.tags('ciGroup24');
this.tags('ciGroup12');
loadTestFile(require.resolve('./ip'));
loadTestFile(require.resolve('./ip_array'));

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('dashboard', function () {
this.tags('ciGroup19');
this.tags('ciGroup7');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./preserve_url'));

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('discover', function () {
this.tags('ciGroup25');
this.tags('ciGroup1');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./preserve_url'));

13
x-pack/test/functional/apps/lens/index.ts
View file

@ -50,6 +50,10 @@ export default function ({ getService, loadTestFile, getPageObjects }: FtrProvid
describe('', function () {
this.tags(['ciGroup4', 'skipFirefox']);
loadTestFile(require.resolve('./add_to_dashboard'));
loadTestFile(require.resolve('./table'));
loadTestFile(require.resolve('./runtime_fields'));
loadTestFile(require.resolve('./dashboard'));
loadTestFile(require.resolve('./colors'));
loadTestFile(require.resolve('./chart_data'));
loadTestFile(require.resolve('./time_shift'));
@ -65,14 +69,5 @@ export default function ({ getService, loadTestFile, getPageObjects }: FtrProvid
// has to be last one in the suite because it overrides saved objects
loadTestFile(require.resolve('./rollup'));
});
describe('', function () {
this.tags(['ciGroup16', 'skipFirefox']);
loadTestFile(require.resolve('./add_to_dashboard'));
loadTestFile(require.resolve('./table'));
loadTestFile(require.resolve('./runtime_fields'));
loadTestFile(require.resolve('./dashboard'));
});
});
}

8
x-pack/test/functional/apps/maps/index.js
View file

@ -72,14 +72,9 @@ export default function ({ loadTestFile, getService }) {
loadTestFile(require.resolve('./full_screen_mode'));
});
describe('', function () {
this.tags('ciGroup22');
loadTestFile(require.resolve('./es_geo_grid_source'));
loadTestFile(require.resolve('./embeddable'));
});
describe('', function () {
this.tags('ciGroup10');
loadTestFile(require.resolve('./es_geo_grid_source'));
loadTestFile(require.resolve('./es_pew_pew_source'));
loadTestFile(require.resolve('./joins'));
loadTestFile(require.resolve('./mapbox_styles'));
@ -88,6 +83,7 @@ export default function ({ loadTestFile, getService }) {
loadTestFile(require.resolve('./add_layer_panel'));
loadTestFile(require.resolve('./import_geojson'));
loadTestFile(require.resolve('./layer_errors'));
loadTestFile(require.resolve('./embeddable'));
loadTestFile(require.resolve('./visualize_create_menu'));
loadTestFile(require.resolve('./discover'));
});

21
x-pack/test/functional/apps/ml/index.ts
View file

@ -13,6 +13,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
describe('machine learning', function () {
describe('', function () {
this.tags('ciGroup3');
before(async () => {
await ml.securityCommon.createMlRoles();
await ml.securityCommon.createMlUsers();
@ -45,19 +47,12 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
await ml.testResources.resetKibanaTimeZone();
});
describe('', function () {
this.tags('ciGroup15');
loadTestFile(require.resolve('./permissions'));
loadTestFile(require.resolve('./pages'));
loadTestFile(require.resolve('./data_visualizer'));
loadTestFile(require.resolve('./data_frame_analytics'));
loadTestFile(require.resolve('./model_management'));
});
describe('', function () {
this.tags('ciGroup26');
loadTestFile(require.resolve('./anomaly_detection'));
});
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('./model_management'));
});
describe('', function () {

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security app', function () {
this.tags('ciGroup7');
this.tags('ciGroup4');
loadTestFile(require.resolve('./security'));
loadTestFile(require.resolve('./doc_level_security_roles'));

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

@ -16,7 +16,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const transform = getService('transform');
describe('transform', function () {
this.tags(['ciGroup21', 'transform']);
this.tags(['ciGroup9', 'transform']);
before(async () => {
await transform.securityCommon.createTransformRoles();

2
x-pack/test/functional_basic/apps/ml/index.ts
View file

@ -12,7 +12,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const ml = getService('ml');
describe('machine learning basic license', function () {
this.tags(['ciGroup14', 'skipFirefox', 'mlqa']);
this.tags(['ciGroup2', 'skipFirefox', 'mlqa']);
before(async () => {
await ml.securityCommon.createMlRoles();

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

@ -13,7 +13,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const supertest = getService('supertest');
describe('saved objects security and spaces enabled', function () {
this.tags('ciGroup20');
this.tags('ciGroup8');
before(async () => {
await createUsersAndRoles(es, supertest);

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

@ -11,7 +11,7 @@ import { createUsersAndRoles } from '../../common/lib';
// eslint-disable-next-line import/no-default-export
export default function ({ loadTestFile, getService }: FtrProviderContext) {
describe('saved objects tagging - functional tests', function () {
this.tags('ciGroup14');
this.tags('ciGroup2');
before(async () => {
await createUsersAndRoles(getService);

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security APIs - Kerberos', function () {
this.tags('ciGroup16');
this.tags('ciGroup6');
loadTestFile(require.resolve('./kerberos_login'));
});

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security APIs - SAML', function () {
this.tags('ciGroup18');
this.tags('ciGroup6');
loadTestFile(require.resolve('./saml_login'));
});

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

@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default function ({ loadTestFile }: FtrProviderContext) {
describe('security APIs - Session Idle', function () {
this.tags('ciGroup18');
this.tags('ciGroup6');
loadTestFile(require.resolve('./cleanup'));
loadTestFile(require.resolve('./extension'));