Revert "[ci] compress jobs for CI stability" (#44584)
This reverts commit debf8c62b4
.
This commit is contained in:
parent
f0b3c86b07
commit
50355d08f2
21
.ci/jobs.yml
21
.ci/jobs.yml
|
@ -1,21 +1,34 @@
|
|||
JOB:
|
||||
- intake
|
||||
- firefoxSmoke
|
||||
- kibana-intake
|
||||
- x-pack-intake
|
||||
- kibana-firefoxSmoke
|
||||
- kibana-ciGroup1
|
||||
- kibana-ciGroup2
|
||||
- kibana-ciGroup3
|
||||
- kibana-ciGroup4
|
||||
- kibana-ciGroup5
|
||||
- kibana-ciGroup6
|
||||
# - kibana-visualRegression
|
||||
- kibana-ciGroup7
|
||||
- kibana-ciGroup8
|
||||
- kibana-ciGroup9
|
||||
- kibana-ciGroup10
|
||||
- kibana-ciGroup11
|
||||
- kibana-ciGroup12
|
||||
- kibana-visualRegression
|
||||
|
||||
# make sure all x-pack-ciGroups are listed in test/scripts/jenkins_xpack_ci_group.sh
|
||||
- x-pack-firefoxSmoke
|
||||
- x-pack-ciGroup1
|
||||
- x-pack-ciGroup2
|
||||
- x-pack-ciGroup3
|
||||
- x-pack-ciGroup4
|
||||
- x-pack-ciGroup5
|
||||
# - x-pack-visualRegression
|
||||
- x-pack-ciGroup6
|
||||
- x-pack-ciGroup7
|
||||
- x-pack-ciGroup8
|
||||
- x-pack-ciGroup9
|
||||
- x-pack-ciGroup10
|
||||
- x-pack-visualRegression
|
||||
|
||||
# `~` is yaml for `null`
|
||||
exclude: ~
|
10
.ci/run.sh
10
.ci/run.sh
|
@ -11,7 +11,7 @@ source src/dev/ci_setup/setup.sh
|
|||
source src/dev/ci_setup/checkout_sibling_es.sh
|
||||
|
||||
case "$JOB" in
|
||||
intake)
|
||||
kibana-intake)
|
||||
./test/scripts/jenkins_unit.sh
|
||||
;;
|
||||
kibana-ciGroup*)
|
||||
|
@ -21,9 +21,12 @@ kibana-ciGroup*)
|
|||
kibana-visualRegression*)
|
||||
./test/scripts/jenkins_visual_regression.sh
|
||||
;;
|
||||
firefoxSmoke*)
|
||||
kibana-firefoxSmoke*)
|
||||
./test/scripts/jenkins_firefox_smoke.sh
|
||||
;;
|
||||
x-pack-intake)
|
||||
./test/scripts/jenkins_xpack.sh
|
||||
;;
|
||||
x-pack-ciGroup*)
|
||||
export CI_GROUP="${JOB##x-pack-ciGroup}"
|
||||
./test/scripts/jenkins_xpack_ci_group.sh
|
||||
|
@ -31,6 +34,9 @@ x-pack-ciGroup*)
|
|||
x-pack-visualRegression*)
|
||||
./test/scripts/jenkins_xpack_visual_regression.sh
|
||||
;;
|
||||
x-pack-firefoxSmoke*)
|
||||
./test/scripts/jenkins_xpack_firefox_smoke.sh
|
||||
;;
|
||||
*)
|
||||
echo "JOB '$JOB' is not implemented."
|
||||
exit 1
|
||||
|
|
|
@ -33,7 +33,7 @@ export default function ({ getService, loadTestFile }) {
|
|||
});
|
||||
|
||||
describe('', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup7');
|
||||
|
||||
loadTestFile(require.resolve('./_create_index_pattern_wizard'));
|
||||
loadTestFile(require.resolve('./_index_pattern_create_delete'));
|
||||
|
@ -45,7 +45,7 @@ export default function ({ getService, loadTestFile }) {
|
|||
});
|
||||
|
||||
describe('', function () {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup8');
|
||||
|
||||
loadTestFile(require.resolve('./_index_pattern_filter'));
|
||||
loadTestFile(require.resolve('./_scripted_fields_filter'));
|
||||
|
|
|
@ -40,7 +40,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
describe('', function() {
|
||||
this.tags('ciGroup3');
|
||||
this.tags('ciGroup9');
|
||||
|
||||
loadTestFile(require.resolve('./_embedding_chart'));
|
||||
loadTestFile(require.resolve('./_chart_types'));
|
||||
|
@ -50,7 +50,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
describe('', function() {
|
||||
this.tags('ciGroup4');
|
||||
this.tags('ciGroup10');
|
||||
|
||||
loadTestFile(require.resolve('./_inspector'));
|
||||
loadTestFile(require.resolve('./_experimental_vis'));
|
||||
|
@ -62,7 +62,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
describe('', function() {
|
||||
this.tags('ciGroup5');
|
||||
this.tags('ciGroup11');
|
||||
|
||||
loadTestFile(require.resolve('./_line_chart'));
|
||||
loadTestFile(require.resolve('./_pie_chart'));
|
||||
|
@ -76,7 +76,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
|
|||
});
|
||||
|
||||
describe('', function() {
|
||||
this.tags('ciGroup6');
|
||||
this.tags('ciGroup12');
|
||||
|
||||
loadTestFile(require.resolve('./_tag_cloud'));
|
||||
loadTestFile(require.resolve('./_tile_map'));
|
||||
|
|
12
test/mocha_decorations.d.ts
vendored
12
test/mocha_decorations.d.ts
vendored
|
@ -26,12 +26,12 @@ type Tags =
|
|||
| 'ciGroup4'
|
||||
| 'ciGroup5'
|
||||
| 'ciGroup6'
|
||||
| 'ciGroup1'
|
||||
| 'ciGroup2'
|
||||
| 'ciGroup3'
|
||||
| 'ciGroup4'
|
||||
| 'ciGroup5'
|
||||
| 'ciGroup6';
|
||||
| 'ciGroup7'
|
||||
| 'ciGroup8'
|
||||
| 'ciGroup9'
|
||||
| 'ciGroup10'
|
||||
| 'ciGroup11'
|
||||
| 'ciGroup12';
|
||||
|
||||
// We need to use the namespace here to match the Mocha definition
|
||||
// eslint-disable-next-line @typescript-eslint/no-namespace
|
||||
|
|
|
@ -17,5 +17,3 @@ checks-reporter-with-killswitch "Firefox smoke test" \
|
|||
--kibana-install-dir "$installDir" \
|
||||
--include-tag "smoke" \
|
||||
--config test/functional/config.firefox.js;
|
||||
|
||||
source "$KIBANA_DIR/test/scripts/jenkins_xpack_firefox_smoke.sh"
|
||||
|
|
|
@ -6,5 +6,3 @@ trap 'node "$KIBANA_DIR/src/dev/failed_tests/cli"' EXIT
|
|||
export TEST_BROWSER_HEADLESS=1
|
||||
|
||||
"$(FORCE_COLOR=0 yarn bin)/grunt" jenkins:unit --dev;
|
||||
|
||||
source "$KIBANA_DIR/test/scripts/jenkins_xpack.sh"
|
||||
|
|
|
@ -14,10 +14,10 @@ node scripts/functional_tests --assert-none-excluded \
|
|||
--include-tag ciGroup4 \
|
||||
--include-tag ciGroup5 \
|
||||
--include-tag ciGroup6 \
|
||||
--include-tag ciGroup1 \
|
||||
--include-tag ciGroup2 \
|
||||
--include-tag ciGroup3 \
|
||||
--include-tag ciGroup4
|
||||
--include-tag ciGroup7 \
|
||||
--include-tag ciGroup8 \
|
||||
--include-tag ciGroup9 \
|
||||
--include-tag ciGroup10
|
||||
|
||||
echo " -> building and extracting default Kibana distributable for use in functional tests"
|
||||
cd "$KIBANA_DIR"
|
||||
|
|
|
@ -19,7 +19,7 @@ export default function alertingApiIntegrationTests({
|
|||
const esArchiver = getService('esArchiver');
|
||||
|
||||
describe('alerting api integration security and spaces enabled', function() {
|
||||
this.tags('ciGroup3');
|
||||
this.tags('ciGroup8');
|
||||
|
||||
before(async () => {
|
||||
for (const space of Spaces) {
|
||||
|
|
|
@ -17,7 +17,7 @@ export default function alertingApiIntegrationTests({
|
|||
const esArchiver = getService('esArchiver');
|
||||
|
||||
describe('alerting api integration spaces only', function() {
|
||||
this.tags('ciGroup3');
|
||||
this.tags('ciGroup8');
|
||||
|
||||
before(async () => {
|
||||
for (const space of Object.values(Spaces)) {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('apis', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
|
||||
loadTestFile(require.resolve('./es'));
|
||||
loadTestFile(require.resolve('./security'));
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('security', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
|
||||
loadTestFile(require.resolve('./basic_login'));
|
||||
loadTestFile(require.resolve('./builtin_es_privileges'));
|
||||
|
|
|
@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
|
||||
export default function({ loadTestFile }: FtrProviderContext) {
|
||||
describe('spaces', function() {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
|
||||
loadTestFile(require.resolve('./saved_objects'));
|
||||
loadTestFile(require.resolve('./space_attributes'));
|
||||
|
|
|
@ -7,7 +7,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
|
||||
export default function({ loadTestFile }: FtrProviderContext) {
|
||||
describe('APM', function() {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./feature_controls'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('dashboard mode', function () {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
|
||||
loadTestFile(require.resolve('./dashboard_view_mode'));
|
||||
});
|
||||
|
|
|
@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
|
||||
export default ({ loadTestFile }: FtrProviderContext) => {
|
||||
describe('Index Lifecycle Management app', function() {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
loadTestFile(require.resolve('./home_page'));
|
||||
});
|
||||
};
|
||||
|
|
|
@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
|
||||
export default ({ loadTestFile }: FtrProviderContext) => {
|
||||
describe('InfraOps app', function() {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
|
||||
loadTestFile(require.resolve('./home_page'));
|
||||
loadTestFile(require.resolve('./feature_controls'));
|
||||
|
|
|
@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
|
||||
export default ({ loadTestFile }: FtrProviderContext) => {
|
||||
describe('License app', function() {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
loadTestFile(require.resolve('./home_page'));
|
||||
});
|
||||
};
|
||||
|
|
|
@ -28,7 +28,7 @@ export default function ({ loadTestFile, getService }) {
|
|||
});
|
||||
|
||||
describe('', function () {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
loadTestFile(require.resolve('./documents_source'));
|
||||
loadTestFile(require.resolve('./saved_object_management'));
|
||||
loadTestFile(require.resolve('./sample_data'));
|
||||
|
@ -38,7 +38,7 @@ export default function ({ loadTestFile, getService }) {
|
|||
});
|
||||
|
||||
describe('', function () {
|
||||
this.tags('ciGroup5');
|
||||
this.tags('ciGroup10');
|
||||
loadTestFile(require.resolve('./es_geo_grid_source'));
|
||||
loadTestFile(require.resolve('./joins'));
|
||||
loadTestFile(require.resolve('./add_layer_panel'));
|
||||
|
|
|
@ -18,7 +18,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
|
|||
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
|
||||
});
|
||||
after(async () => await esArchiver.unload(ARCHIVE));
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
|
||||
loadTestFile(require.resolve('./feature_controls'));
|
||||
loadTestFile(require.resolve('./overview'));
|
||||
|
|
|
@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
|
|||
|
||||
export default function({ loadTestFile }: FtrProviderContext) {
|
||||
describe('apis Kerberos', function() {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./security'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('apis', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./oidc_auth'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
|
|||
// eslint-disable-next-line import/no-default-export
|
||||
export default function({ loadTestFile }: FtrProviderContext) {
|
||||
describe('apis', function() {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./oidc_auth'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
|
|||
|
||||
export default function({ loadTestFile }: FtrProviderContext) {
|
||||
describe('apis PKI', function() {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./security'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('reporting app', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./reporting'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('apis SAML', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./security'));
|
||||
});
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
|
|||
const supertest = getService('supertest');
|
||||
|
||||
describe('saved objects security only enabled', function() {
|
||||
this.tags('ciGroup4');
|
||||
this.tags('ciGroup9');
|
||||
|
||||
before(async () => {
|
||||
await createUsersAndRoles(es, supertest);
|
||||
|
|
|
@ -13,7 +13,7 @@ export default function({ loadTestFile, getService }: TestInvoker) {
|
|||
const supertest = getService('supertest');
|
||||
|
||||
describe('spaces api with security', function() {
|
||||
this.tags('ciGroup3');
|
||||
this.tags('ciGroup8');
|
||||
|
||||
before(async () => {
|
||||
await createUsersAndRoles(es, supertest);
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('token-based auth', function () {
|
||||
this.tags('ciGroup1');
|
||||
this.tags('ciGroup6');
|
||||
loadTestFile(require.resolve('./login'));
|
||||
loadTestFile(require.resolve('./logout'));
|
||||
loadTestFile(require.resolve('./header'));
|
||||
|
|
|
@ -17,7 +17,7 @@ export default function uiCapabilitiesTests({ loadTestFile, getService }: FtrPro
|
|||
const featuresService: FeaturesService = getService('features');
|
||||
|
||||
describe('ui capabilities', function() {
|
||||
this.tags('ciGroup4');
|
||||
this.tags('ciGroup9');
|
||||
|
||||
before(async () => {
|
||||
const features = await featuresService.get();
|
||||
|
|
|
@ -13,7 +13,7 @@ export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProv
|
|||
const securityService: SecurityService = getService('security');
|
||||
|
||||
describe('ui capabilities', function() {
|
||||
this.tags('ciGroup4');
|
||||
this.tags('ciGroup9');
|
||||
|
||||
before(async () => {
|
||||
for (const user of UserScenarios) {
|
||||
|
|
|
@ -14,7 +14,7 @@ export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProv
|
|||
const featuresService: FeaturesService = getService('features');
|
||||
|
||||
describe('ui capabilities', function() {
|
||||
this.tags('ciGroup4');
|
||||
this.tags('ciGroup9');
|
||||
|
||||
before(async () => {
|
||||
const features = await featuresService.get();
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
export default function ({ loadTestFile }) {
|
||||
describe('upgrade assistant', function () {
|
||||
this.tags('ciGroup2');
|
||||
this.tags('ciGroup7');
|
||||
|
||||
loadTestFile(require.resolve('./reindexing'));
|
||||
});
|
||||
|
|
|
@ -26,7 +26,7 @@ export default function ({ loadTestFile, getService }) {
|
|||
await esArchiver.unload('maps/kibana');
|
||||
});
|
||||
|
||||
this.tags('ciGroup5');
|
||||
this.tags('ciGroup10');
|
||||
loadTestFile(require.resolve('./vector_styling'));
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue