Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reporting phantom and chromium tests should run in parallel. #26566

Merged
merged 7 commits into from
Dec 6, 2018
Merged

Reporting phantom and chromium tests should run in parallel. #26566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0f2af80
Reporting phantom and chromium tests should run in parallel.
njd5475 Dec 3, 2018
def6fd4
Chromium tests should be done in group 9.
njd5475 Dec 3, 2018
9f296ba
Merge branch 'master' into testing/improve-ci-speed
njd5475 Dec 4, 2018
1936614
Attempting to use group 2 in ci for chromium tests.
njd5475 Dec 4, 2018
59bb2fe
X-pack CI jobs should have 7 groups.
njd5475 Dec 4, 2018
749707e
Phantom tests should be in group 7.
njd5475 Dec 4, 2018
101273b
Merge branch 'master' into testing/improve-ci-speed
njd5475 Dec 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/jobs.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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