Skip to content

Commit

Permalink
Reporting phantom and chromium tests should run in parallel. (#26566)
Browse files Browse the repository at this point in the history
* Reporting phantom and chromium tests should run in parallel.

* Chromium tests should be done in group 9.

* Attempting to use group 2 in ci for chromium tests.

* X-pack CI jobs should have 7 groups.

* Phantom tests should be in group 7.
  • Loading branch information
njd5475 authored and chrisronline committed Dec 12, 2018
1 parent 1cc57e8 commit b89da88
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .ci/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ JOB:
- x-pack-ciGroup4
- x-pack-ciGroup5
- x-pack-ciGroup6
- x-pack-ciGroup7

# `~` is yaml for `null`
exclude: ~
3 changes: 2 additions & 1 deletion test/scripts/jenkins_xpack_ci_group.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ node scripts/functional_tests --assert-none-excluded \
--include-tag ciGroup3 \
--include-tag ciGroup4 \
--include-tag ciGroup5 \
--include-tag ciGroup6
--include-tag ciGroup6 \
--include-tag ciGroup7

echo " -> building and extracting default Kibana distributable for use in functional tests"
cd "$KIBANA_DIR"
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/infra/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { KibanaFunctionalTestDefaultProviders } from '../../../types/providers';
// tslint:disable-next-line:no-default-export
export default ({ loadTestFile }: KibanaFunctionalTestDefaultProviders) => {
describe('InfraOps app', function() {
this.tags('ciGroup4');
this.tags('ciGroup7');

loadTestFile(require.resolve('./home_page'));
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/reporting/api/chromium_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) {
const kibanaServer = getService('kibanaServer');

describe('chromium', function () {
this.tags('ciGroup6');
this.tags('ciGroup2');

before(async () => {
await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/reporting/api/phantom_tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) {
const kibanaServer = getService('kibanaServer');

describe('phantom', function () {
this.tags('ciGroup6');
this.tags('ciGroup7');

before(async () => {
await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH);
Expand Down

0 comments on commit b89da88

Please sign in to comment.