github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "Revert "Revert "[ci] compress jobs for CI stab… (#45454)

Browse source 
* Revert "Revert "Revert "Revert "[ci] compress jobs for CI stability" (#44584)"""

This reverts commit 148b8c0f90.

* sync changes with Jenkinsfile

(cherry picked from commit 9a109f2170)
This commit is contained in:
Spencer 2019-09-11 15:27:43 -07:00 • committed by spalger
parent 518a88d5c8
commit 77eb3d3c53
35 changed files with 67 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

21
.ci/jobs.yml
View file

@ -1,34 +1,21 @@
JOB:
- kibana-intake
- x-pack-intake
- kibana-firefoxSmoke
- intake
- firefoxSmoke
- kibana-ciGroup1
- kibana-ciGroup2
- kibana-ciGroup3
- kibana-ciGroup4
- kibana-ciGroup5
- kibana-ciGroup6
- kibana-ciGroup7
- kibana-ciGroup8
- kibana-ciGroup9
- kibana-ciGroup10
- kibana-ciGroup11
- kibana-ciGroup12
- kibana-visualRegression
# - 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-ciGroup6
- x-pack-ciGroup7
- x-pack-ciGroup8
- x-pack-ciGroup9
- x-pack-ciGroup10
- x-pack-visualRegression
# - x-pack-visualRegression
# `~` is yaml for `null`
exclude: ~

10
.ci/run.sh
View file

@ -11,7 +11,7 @@ source src/dev/ci_setup/setup.sh
source src/dev/ci_setup/checkout_sibling_es.sh
case "$JOB" in
kibana-intake)
intake)
./test/scripts/jenkins_unit.sh
;;
kibana-ciGroup*)
@ -21,12 +21,9 @@ kibana-ciGroup*)
kibana-visualRegression*)
./test/scripts/jenkins_visual_regression.sh
;;
kibana-firefoxSmoke*)
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
@ -34,9 +31,6 @@ 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

34
Jenkinsfile vendored
View file

@ -10,8 +10,8 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
ansiColor('xterm') {
catchError {
parallel([
'kibana-intake-agent': legacyJobRunner('kibana-intake'),
'x-pack-intake-agent': legacyJobRunner('x-pack-intake'),
'intake-agent': legacyJobRunner('intake'),
'firefox-smoke-agent': legacyJobRunner('firefoxSmoke'),
'kibana-oss-agent': withWorkers('kibana-oss-tests', { buildOss() }, [
'oss-ciGroup1': getOssCiGroupWorker(1),
'oss-ciGroup2': getOssCiGroupWorker(2),
@ -19,14 +19,14 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
'oss-ciGroup4': getOssCiGroupWorker(4),
'oss-ciGroup5': getOssCiGroupWorker(5),
'oss-ciGroup6': getOssCiGroupWorker(6),
'oss-ciGroup7': getOssCiGroupWorker(7),
'oss-ciGroup8': getOssCiGroupWorker(8),
'oss-ciGroup9': getOssCiGroupWorker(9),
'oss-ciGroup10': getOssCiGroupWorker(10),
'oss-ciGroup11': getOssCiGroupWorker(11),
'oss-ciGroup12': getOssCiGroupWorker(12),
'oss-visualRegression': getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
'oss-firefoxSmoke': getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
// 'oss-ciGroup7': getOssCiGroupWorker(7),
// 'oss-ciGroup8': getOssCiGroupWorker(8),
// 'oss-ciGroup9': getOssCiGroupWorker(9),
// 'oss-ciGroup10': getOssCiGroupWorker(10),
// 'oss-ciGroup11': getOssCiGroupWorker(11),
// 'oss-ciGroup12': getOssCiGroupWorker(12),
// 'oss-visualRegression': getPostBuildWorker('visualRegression', { runbld './test/scripts/jenkins_visual_regression.sh' }),
// 'oss-firefoxSmoke': getPostBuildWorker('firefoxSmoke', { runbld './test/scripts/jenkins_firefox_smoke.sh' }),
]),
'kibana-xpack-agent': withWorkers('kibana-xpack-tests', { buildXpack() }, [
'xpack-ciGroup1': getXpackCiGroupWorker(1),
@ -34,13 +34,13 @@ stage("Kibana Pipeline") { // This stage is just here to help the BlueOcean UI a
'xpack-ciGroup3': getXpackCiGroupWorker(3),
'xpack-ciGroup4': getXpackCiGroupWorker(4),
'xpack-ciGroup5': getXpackCiGroupWorker(5),
'xpack-ciGroup6': getXpackCiGroupWorker(6),
'xpack-ciGroup7': getXpackCiGroupWorker(7),
'xpack-ciGroup8': getXpackCiGroupWorker(8),
'xpack-ciGroup9': getXpackCiGroupWorker(9),
'xpack-ciGroup10': getXpackCiGroupWorker(10),
'xpack-firefoxSmoke': getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
'xpack-visualRegression': getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
// 'xpack-ciGroup6': getXpackCiGroupWorker(6),
// 'xpack-ciGroup7': getXpackCiGroupWorker(7),
// 'xpack-ciGroup8': getXpackCiGroupWorker(8),
// 'xpack-ciGroup9': getXpackCiGroupWorker(9),
// 'xpack-ciGroup10': getXpackCiGroupWorker(10),
// 'xpack-firefoxSmoke': getPostBuildWorker('xpack-firefoxSmoke', { runbld './test/scripts/jenkins_xpack_firefox_smoke.sh' }),
// 'xpack-visualRegression': getPostBuildWorker('xpack-visualRegression', { runbld './test/scripts/jenkins_xpack_visual_regression.sh' }),
]),
])
}

4
test/functional/apps/management/index.js
View file

@ -33,7 +33,7 @@ export default function ({ getService, loadTestFile }) {
});
describe('', function () {
this.tags('ciGroup7');
this.tags('ciGroup1');
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('ciGroup8');
this.tags('ciGroup2');
loadTestFile(require.resolve('./_index_pattern_filter'));
loadTestFile(require.resolve('./_scripted_fields_filter'));

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

@ -40,7 +40,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function() {
this.tags('ciGroup9');
this.tags('ciGroup3');
loadTestFile(require.resolve('./_embedding_chart'));
loadTestFile(require.resolve('./_chart_types'));
@ -50,7 +50,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function() {
this.tags('ciGroup10');
this.tags('ciGroup4');
loadTestFile(require.resolve('./_inspector'));
loadTestFile(require.resolve('./_experimental_vis'));
@ -62,7 +62,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function() {
this.tags('ciGroup11');
this.tags('ciGroup5');
loadTestFile(require.resolve('./_line_chart'));
loadTestFile(require.resolve('./_pie_chart'));
@ -76,7 +76,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
});
describe('', function() {
this.tags('ciGroup12');
this.tags('ciGroup6');
loadTestFile(require.resolve('./_tag_cloud'));
loadTestFile(require.resolve('./_tile_map'));

12
test/mocha_decorations.d.ts vendored
View file

@ -26,12 +26,12 @@ type Tags =
| 'ciGroup4'
| 'ciGroup5'
| 'ciGroup6'
| 'ciGroup7'
| 'ciGroup8'
| 'ciGroup9'
| 'ciGroup10'
| 'ciGroup11'
| 'ciGroup12';
| 'ciGroup1'
| 'ciGroup2'
| 'ciGroup3'
| 'ciGroup4'
| 'ciGroup5'
| 'ciGroup6';
// We need to use the namespace here to match the Mocha definition
// eslint-disable-next-line @typescript-eslint/no-namespace

2
test/scripts/jenkins_firefox_smoke.sh
View file

@ -29,3 +29,5 @@ 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"

2
test/scripts/jenkins_unit.sh
View file

@ -6,3 +6,5 @@ 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"

7
test/scripts/jenkins_xpack_ci_group.sh
View file

@ -17,12 +17,7 @@ if [[ -z "$IS_PIPELINE_JOB" ]] ; then
--include-tag ciGroup2 \
--include-tag ciGroup3 \
--include-tag ciGroup4 \
--include-tag ciGroup5 \
--include-tag ciGroup6 \
--include-tag ciGroup7 \
--include-tag ciGroup8 \
--include-tag ciGroup9 \
--include-tag ciGroup10
--include-tag ciGroup5
fi
cd "$KIBANA_DIR"

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

@ -19,7 +19,7 @@ export default function alertingApiIntegrationTests({
const esArchiver = getService('esArchiver');
describe('alerting api integration security and spaces enabled', function() {
this.tags('ciGroup8');
this.tags('ciGroup3');
before(async () => {
for (const space of Spaces) {

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

@ -17,7 +17,7 @@ export default function alertingApiIntegrationTests({
const esArchiver = getService('esArchiver');
describe('alerting api integration spaces only', function() {
this.tags('ciGroup8');
this.tags('ciGroup3');
before(async () => {
for (const space of Object.values(Spaces)) {

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

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('apis', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./es'));
loadTestFile(require.resolve('./security'));

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

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('security', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./basic_login'));
loadTestFile(require.resolve('./builtin_es_privileges'));

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

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

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

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

2
x-pack/test/functional/apps/dashboard_mode/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('dashboard mode', function () {
this.tags('ciGroup7');
this.tags('ciGroup2');
loadTestFile(require.resolve('./dashboard_view_mode'));
});

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

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext) => {
describe('Index Lifecycle Management app', function() {
this.tags('ciGroup7');
this.tags('ciGroup2');
loadTestFile(require.resolve('./home_page'));
});
};

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

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext) => {
describe('InfraOps app', function() {
this.tags('ciGroup7');
this.tags('ciGroup2');
loadTestFile(require.resolve('./home_page'));
loadTestFile(require.resolve('./feature_controls'));

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

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
export default ({ loadTestFile }: FtrProviderContext) => {
describe('License app', function() {
this.tags('ciGroup7');
this.tags('ciGroup2');
loadTestFile(require.resolve('./home_page'));
});
};

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

@ -28,7 +28,7 @@ export default function ({ loadTestFile, getService }) {
});
describe('', function () {
this.tags('ciGroup7');
this.tags('ciGroup2');
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('ciGroup10');
this.tags('ciGroup5');
loadTestFile(require.resolve('./es_geo_grid_source'));
loadTestFile(require.resolve('./joins'));
loadTestFile(require.resolve('./add_layer_panel'));

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

@ -18,7 +18,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
await kibanaServer.uiSettings.replace({ 'dateFormat:tz': 'UTC' });
});
after(async () => await esArchiver.unload(ARCHIVE));
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./feature_controls'));
loadTestFile(require.resolve('./overview'));

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

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

2
x-pack/test/oidc_api_integration/apis/authorization_code_flow/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('apis', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./oidc_auth'));
});
}

2
x-pack/test/oidc_api_integration/apis/implicit_flow/index.ts
View file

@ -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('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./oidc_auth'));
});
}

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

@ -8,7 +8,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
export default function({ loadTestFile }: FtrProviderContext) {
describe('apis PKI', function() {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./security'));
});
}

2
x-pack/test/reporting/functional/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('reporting app', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./reporting'));
});
}

2
x-pack/test/saml_api_integration/apis/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('apis SAML', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./security'));
});
}

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

@ -12,7 +12,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
const supertest = getService('supertest');
describe('saved objects security only enabled', function() {
this.tags('ciGroup9');
this.tags('ciGroup4');
before(async () => {
await createUsersAndRoles(es, supertest);

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

@ -13,7 +13,7 @@ export default function({ loadTestFile, getService }: TestInvoker) {
const supertest = getService('supertest');
describe('spaces api with security', function() {
this.tags('ciGroup8');
this.tags('ciGroup3');
before(async () => {
await createUsersAndRoles(es, supertest);

2
x-pack/test/token_api_integration/auth/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('token-based auth', function () {
this.tags('ciGroup6');
this.tags('ciGroup1');
loadTestFile(require.resolve('./login'));
loadTestFile(require.resolve('./logout'));
loadTestFile(require.resolve('./header'));

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

@ -17,7 +17,7 @@ export default function uiCapabilitiesTests({ loadTestFile, getService }: FtrPro
const featuresService: FeaturesService = getService('features');
describe('ui capabilities', function() {
this.tags('ciGroup9');
this.tags('ciGroup4');
before(async () => {
const features = await featuresService.get();

2
x-pack/test/ui_capabilities/security_only/tests/index.ts
View file

@ -13,7 +13,7 @@ export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProv
const securityService: SecurityService = getService('security');
describe('ui capabilities', function() {
this.tags('ciGroup9');
this.tags('ciGroup4');
before(async () => {
for (const user of UserScenarios) {

2
x-pack/test/ui_capabilities/spaces_only/tests/index.ts
View file

@ -14,7 +14,7 @@ export default function uiCapabilitesTests({ loadTestFile, getService }: FtrProv
const featuresService: FeaturesService = getService('features');
describe('ui capabilities', function() {
this.tags('ciGroup9');
this.tags('ciGroup4');
before(async () => {
const features = await featuresService.get();

2
x-pack/test/upgrade_assistant_integration/upgrade_assistant/index.js
View file

@ -6,7 +6,7 @@
export default function ({ loadTestFile }) {
describe('upgrade assistant', function () {
this.tags('ciGroup7');
this.tags('ciGroup2');
loadTestFile(require.resolve('./query_default_field'));
loadTestFile(require.resolve('./reindexing'));

2
x-pack/test/visual_regression/tests/maps/index.js
View file

@ -26,7 +26,7 @@ export default function ({ loadTestFile, getService }) {
await esArchiver.unload('maps/kibana');
});
this.tags('ciGroup10');
this.tags('ciGroup5');
loadTestFile(require.resolve('./vector_styling'));
});
}