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.

Sign up for GitHub

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

[CI] Balance ci groups #110711

Merged
merged 9 commits into from
Sep 22, 2021
Merged

[CI] Balance ci groups #110711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
226a946
Attempt to balance ci groups a little bit
brianseeders Aug 31, 2021
5f29d42
Merge branch 'master' into balance-ci-groups-202120831
kibanamachine Sep 8, 2021
bca73b7
Merge branch 'master' into balance-ci-groups-202120831
brianseeders Sep 20, 2021
804ef91
Try moving tests to xpack 3 instead
brianseeders Sep 21, 2021
7c32433
Merge branch 'master' into balance-ci-groups-202120831
brianseeders Sep 21, 2021
a238b39
Try moving lens to the end
brianseeders Sep 21, 2021
60ff513
Shuffle cases around again, and move some tsvb tests
brianseeders Sep 21, 2021
4c1dc65
Move some more tests
brianseeders Sep 21, 2021
57908cd
Undo accidental change
brianseeders Sep 22, 2021
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
7 changes: 6 additions & 1 deletion test/functional/apps/visualize/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,16 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
loadTestFile(require.resolve('./_add_to_dashboard.ts'));
});

describe('visualize ciGroup8', function () {
this.tags('ciGroup8');

loadTestFile(require.resolve('./_tsvb_chart'));
});

describe('visualize ciGroup11', function () {
this.tags('ciGroup11');

loadTestFile(require.resolve('./_tag_cloud'));
loadTestFile(require.resolve('./_tsvb_chart'));
loadTestFile(require.resolve('./_tsvb_time_series'));
loadTestFile(require.resolve('./_tsvb_markdown'));
loadTestFile(require.resolve('./_tsvb_table'));
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('ciGroup5');
this.tags('ciGroup13');

before(async () => {
await createSpacesAndUsers(getService);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/
export default ({ loadTestFile, getService }: FtrProviderContext): void => {
describe('cases security and spaces enabled: trial', function () {
// Fastest ciGroup for the moment.
this.tags('ciGroup5');
this.tags('ciGroup13');

before(async () => {
await createSpacesAndUsers(getService);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/apm/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';

export default function ({ loadTestFile }: FtrProviderContext) {
describe('APM specs', function () {
this.tags('ciGroup6');
this.tags('ciGroup10');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./correlations'));
});
Expand Down
6 changes: 5 additions & 1 deletion x-pack/test/functional/apps/lens/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
});

describe('', function () {
this.tags(['ciGroup3', 'skipFirefox']);
loadTestFile(require.resolve('./smokescreen'));
});

describe('', function () {
this.tags(['ciGroup4', 'skipFirefox']);

loadTestFile(require.resolve('./smokescreen'));
loadTestFile(require.resolve('./add_to_dashboard'));
loadTestFile(require.resolve('./table'));
loadTestFile(require.resolve('./runtime_fields'));
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/uptime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
const uptime = getService('uptime');

describe('Uptime app', function () {
this.tags('ciGroup6');
this.tags('ciGroup10');

beforeEach('delete settings', async () => {
await deleteUptimeSettingsObject(server);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/uptime/synthetics_integration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
});

describe('When on the Synthetics Integration Policy Create Page', function () {
this.tags(['ciGroup6']);
this.tags(['ciGroup10']);
const basicConfig = {
name: monitorName,
apmServiceName: 'Sample APM Service',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export default async function ({ readConfigFile }) {
resolve(__dirname, './apps/discover'),
resolve(__dirname, './apps/security'),
resolve(__dirname, './apps/spaces'),
resolve(__dirname, './apps/lens'),
resolve(__dirname, './apps/logstash'),
resolve(__dirname, './apps/grok_debugger'),
resolve(__dirname, './apps/infra'),
Expand All @@ -58,6 +57,7 @@ export default async function ({ readConfigFile }) {
resolve(__dirname, './apps/reporting_management'),
resolve(__dirname, './apps/management'),
resolve(__dirname, './apps/reporting'),
resolve(__dirname, './apps/lens'), // smokescreen tests cause flakiness in other tests

// This license_management file must be last because it is destructive.
resolve(__dirname, './apps/license_management'),
Expand Down