(core) Parallelize jenkins by running on multiple machines.

Summary:
- Get Jenkins to run on 4 agents in parallel, each executing 4 parallel test runs.
- Add a scheme for automatically selecting non-conflicting ports and Redis DB numbers.
- Add a scheme for automatically deciding how to group tests in large suites (nbrowser, server) to keep groups roughly equal.
- Add a recording of test timings, that's used for the auto-grouping.
- Fix tests that were sensitive to the order in which they were running.

Test Plan: All 5020 tests passed in 9 minutes (as opposed to the previous passing run which took 30).

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D3500
pull/214/head
Dmitry S 2 years ago
parent 637caf8105
commit d5ebd49eb7

@ -43,7 +43,7 @@ const noCleanup = Boolean(process.env.NO_CLEANUP);
export function createDocTools(options: {persistAcrossCases?: boolean,
useFixturePlugins?: boolean,
storageManager?: IDocStorageManager,
server?: GristServer} = {}) {
server?: () => GristServer} = {}) {
let tmpDir: string;
let docManager: DocManager;
@ -51,7 +51,7 @@ export function createDocTools(options: {persistAcrossCases?: boolean,
tmpDir = await createTmpDir();
const pluginManager = options.useFixturePlugins ? await createFixturePluginManager() : undefined;
docManager = await createDocManager({tmpDir, pluginManager, storageManager: options.storageManager,
server: options.server});
server: options.server?.()});
}
async function doAfter() {

@ -51,9 +51,8 @@ describe('Authorizer', function() {
testUtils.setTmpLogLevel('fatal');
server = new FlexServer(0, 'test docWorker');
const docTools = createDocTools({persistAcrossCases: true, useFixturePlugins: false,
server});
server: () => (server = new FlexServer(0, 'test docWorker'))});
const docs: {[name: string]: {id: string}} = {};
// Loads the fixtures documents so that they are available to the doc worker under the correct

@ -2,11 +2,15 @@
// monkey-patch. Also refactored, but not converted to typescript, to avoid slowing down mocha
// runs with ts-node.
//
// It also produces a file timings.txt with timings, made of lines of the form:
// <TEST_SUITE> <top-level-describe-suite> <number-of-milliseconds>
//
// Respects the following environment variables:
// XUNIT_FILE: path of output XML file (default: xunit.xml)
// XUNIT_SILENT: suppress human-friendly logging to the console
// XUNIT_SUITE_NAME: name to use for the top-level <testsuite> (default: "Mocha Tests")
// XUNIT_CLASS_PREFIX: prefix to use for <testcase classname=...> attribute (default: "")
// TEST_SUITE: name of the test suite to prefix timings with.
@ -19,6 +23,8 @@ const filePath = process.env.XUNIT_FILE || "xunit.xml";
const consoleOutput = !process.env.XUNIT_SILENT;
const suiteName = process.env.XUNIT_SUITE_NAME || 'Mocha Tests';
const classPrefix = process.env.XUNIT_CLASS_PREFIX || '';
const timingsPath = path.join(path.dirname(filePath), "timings.txt");
const testSuite = process.env.TEST_SUITE || 'unset_suite';
/**
* Save reference to avoid Sinon interfering (see GH-237).
@ -43,10 +49,33 @@ class XUnitFile extends reporters.Base {
const stats = this.stats;
const tests = [];
fse.mkdirpSync(path.dirname(filePath));
const fd = fse.openSync(filePath, 'w', 0o0755);
const fd = fse.openSync(filePath, 'w', 0o0644);
const timingsFd = fse.openSync(timingsPath, 'w', 0o0644);
const startedSuites = new Map();
let ending = false;
// We have to be a little clever about closing the timings descriptor because the 'end' event
// may occur *before* the last 'suite end' event.
function maybeCloseTimings() {
if (ending && startedSuites.size === 0) {
fse.closeSync(timingsFd);
}
}
runner.on('suite', (suite) => {
logToConsole(suite.fullTitle());
startedSuites.set(suite, Date.now());
});
runner.on('suite end', (suite) => {
// Every time a (top-level) suite ends, add a line to the timings file.
if (suite.titlePath().length == 1) {
const duration = Date.now() - startedSuites.get(suite);
appendLine(timingsFd, `${testSuite} ${suite.fullTitle()} ${duration}`);
startedSuites.delete(suite);
// If 'end' has already happened, close the file.
maybeCloseTimings();
}
});
runner.on('pass', (test) => {
@ -85,6 +114,8 @@ class XUnitFile extends reporters.Base {
appendLine(fd, '</testsuite>');
fse.closeSync(fd);
ending = true;
maybeCloseTimings();
});
}
}

Loading…
Cancel
Save