Co-authored-by: Brian Seeders <brian.seeders@elastic.co>
This commit is contained in:
parent
dd119d001c
commit
66b1682ada
|
@ -23,11 +23,16 @@ for (let i = 1; i <= OSS_CI_GROUPS; i++) {
|
||||||
inputs.push(stepInput(`oss/cigroup/${i}`, `OSS CI Group ${i}`));
|
inputs.push(stepInput(`oss/cigroup/${i}`, `OSS CI Group ${i}`));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inputs.push(stepInput(`oss/firefox`, 'OSS Firefox'));
|
||||||
|
inputs.push(stepInput(`oss/accessibility`, 'OSS Accessibility'));
|
||||||
|
|
||||||
for (let i = 1; i <= XPACK_CI_GROUPS; i++) {
|
for (let i = 1; i <= XPACK_CI_GROUPS; i++) {
|
||||||
inputs.push(stepInput(`xpack/cigroup/${i}`, `Default CI Group ${i}`));
|
inputs.push(stepInput(`xpack/cigroup/${i}`, `Default CI Group ${i}`));
|
||||||
}
|
}
|
||||||
|
|
||||||
inputs.push(stepInput(`xpack/cigroup/Docker`, 'Default CI Group Docker'));
|
inputs.push(stepInput(`xpack/cigroup/Docker`, 'Default CI Group Docker'));
|
||||||
|
inputs.push(stepInput(`xpack/firefox`, 'Default Firefox'));
|
||||||
|
inputs.push(stepInput(`xpack/accessibility`, 'Default Accessibility'));
|
||||||
|
|
||||||
const pipeline = {
|
const pipeline = {
|
||||||
steps: [
|
steps: [
|
||||||
|
|
|
@ -65,34 +65,67 @@ for (const testSuite of testSuites) {
|
||||||
|
|
||||||
const JOB_PARTS = TEST_SUITE.split('/');
|
const JOB_PARTS = TEST_SUITE.split('/');
|
||||||
const IS_XPACK = JOB_PARTS[0] === 'xpack';
|
const IS_XPACK = JOB_PARTS[0] === 'xpack';
|
||||||
|
const TASK = JOB_PARTS[1];
|
||||||
const CI_GROUP = JOB_PARTS.length > 2 ? JOB_PARTS[2] : '';
|
const CI_GROUP = JOB_PARTS.length > 2 ? JOB_PARTS[2] : '';
|
||||||
|
|
||||||
if (RUN_COUNT < 1) {
|
if (RUN_COUNT < 1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IS_XPACK) {
|
switch (TASK) {
|
||||||
steps.push({
|
case 'cigroup':
|
||||||
command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/xpack_cigroup.sh`,
|
if (IS_XPACK) {
|
||||||
label: `Default CI Group ${CI_GROUP}`,
|
steps.push({
|
||||||
agents: { queue: 'ci-group-6' },
|
command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/xpack_cigroup.sh`,
|
||||||
depends_on: 'build',
|
label: `Default CI Group ${CI_GROUP}`,
|
||||||
parallelism: RUN_COUNT,
|
agents: { queue: 'ci-group-6' },
|
||||||
concurrency: concurrency,
|
depends_on: 'build',
|
||||||
concurrency_group: UUID,
|
parallelism: RUN_COUNT,
|
||||||
concurrency_method: 'eager',
|
concurrency: concurrency,
|
||||||
});
|
concurrency_group: UUID,
|
||||||
} else {
|
concurrency_method: 'eager',
|
||||||
steps.push({
|
});
|
||||||
command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/oss_cigroup.sh`,
|
} else {
|
||||||
label: `OSS CI Group ${CI_GROUP}`,
|
steps.push({
|
||||||
agents: { queue: 'ci-group-4d' },
|
command: `CI_GROUP=${CI_GROUP} .buildkite/scripts/steps/functional/oss_cigroup.sh`,
|
||||||
depends_on: 'build',
|
label: `OSS CI Group ${CI_GROUP}`,
|
||||||
parallelism: RUN_COUNT,
|
agents: { queue: 'ci-group-4d' },
|
||||||
concurrency: concurrency,
|
depends_on: 'build',
|
||||||
concurrency_group: UUID,
|
parallelism: RUN_COUNT,
|
||||||
concurrency_method: 'eager',
|
concurrency: concurrency,
|
||||||
});
|
concurrency_group: UUID,
|
||||||
|
concurrency_method: 'eager',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'firefox':
|
||||||
|
steps.push({
|
||||||
|
command: `.buildkite/scripts/steps/functional/${IS_XPACK ? 'xpack' : 'oss'}_firefox.sh`,
|
||||||
|
label: `${IS_XPACK ? 'Default' : 'OSS'} Firefox`,
|
||||||
|
agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
|
||||||
|
depends_on: 'build',
|
||||||
|
parallelism: RUN_COUNT,
|
||||||
|
concurrency: concurrency,
|
||||||
|
concurrency_group: UUID,
|
||||||
|
concurrency_method: 'eager',
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 'accessibility':
|
||||||
|
steps.push({
|
||||||
|
command: `.buildkite/scripts/steps/functional/${
|
||||||
|
IS_XPACK ? 'xpack' : 'oss'
|
||||||
|
}_accessibility.sh`,
|
||||||
|
label: `${IS_XPACK ? 'Default' : 'OSS'} Accessibility`,
|
||||||
|
agents: { queue: IS_XPACK ? 'ci-group-6' : 'ci-group-4d' },
|
||||||
|
depends_on: 'build',
|
||||||
|
parallelism: RUN_COUNT,
|
||||||
|
concurrency: concurrency,
|
||||||
|
concurrency_group: UUID,
|
||||||
|
concurrency_method: 'eager',
|
||||||
|
});
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue