From 0f2af8062d257b1ee0c0882be9d5d4be1afd7016 Mon Sep 17 00:00:00 2001 From: Nicholas Dziedzic Date: Mon, 3 Dec 2018 15:07:50 -0500 Subject: [PATCH 1/5] Reporting phantom and chromium tests should run in parallel. --- x-pack/test/reporting/api/phantom_tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/reporting/api/phantom_tests.js b/x-pack/test/reporting/api/phantom_tests.js index e0c8c11b326bd..5fb9f8d5ba155 100644 --- a/x-pack/test/reporting/api/phantom_tests.js +++ b/x-pack/test/reporting/api/phantom_tests.js @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) { const kibanaServer = getService('kibanaServer'); describe('phantom', function () { - this.tags('ciGroup6'); + this.tags('ciGroup3'); before(async () => { await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH); From def6fd4e129c46a6431cf5a230053fb5ebda0182 Mon Sep 17 00:00:00 2001 From: Nicholas Dziedzic Date: Mon, 3 Dec 2018 16:51:45 -0500 Subject: [PATCH 2/5] Chromium tests should be done in group 9. --- x-pack/test/reporting/api/chromium_tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/reporting/api/chromium_tests.js b/x-pack/test/reporting/api/chromium_tests.js index b983f290eb085..38228456346a1 100644 --- a/x-pack/test/reporting/api/chromium_tests.js +++ b/x-pack/test/reporting/api/chromium_tests.js @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) { const kibanaServer = getService('kibanaServer'); describe('chromium', function () { - this.tags('ciGroup6'); + this.tags('ciGroup9'); before(async () => { await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH); From 19366140b57d72ef329129a89a576fff3b4efe20 Mon Sep 17 00:00:00 2001 From: Nicholas Dziedzic Date: Tue, 4 Dec 2018 11:19:58 -0500 Subject: [PATCH 3/5] Attempting to use group 2 in ci for chromium tests. --- x-pack/test/reporting/api/chromium_tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/reporting/api/chromium_tests.js b/x-pack/test/reporting/api/chromium_tests.js index 38228456346a1..892f561539387 100644 --- a/x-pack/test/reporting/api/chromium_tests.js +++ b/x-pack/test/reporting/api/chromium_tests.js @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) { const kibanaServer = getService('kibanaServer'); describe('chromium', function () { - this.tags('ciGroup9'); + this.tags('ciGroup2'); before(async () => { await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH); From 59bb2fe5f1a6fa77c4e81b0787da8c6d9448d34d Mon Sep 17 00:00:00 2001 From: Nicholas Dziedzic Date: Tue, 4 Dec 2018 14:17:20 -0500 Subject: [PATCH 4/5] X-pack CI jobs should have 7 groups. --- .ci/jobs.yml | 1 + test/scripts/jenkins_xpack_ci_group.sh | 3 ++- x-pack/test/functional/apps/infra/index.ts | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.ci/jobs.yml b/.ci/jobs.yml index f9302db4b2910..84d8f75acbd30 100644 --- a/.ci/jobs.yml +++ b/.ci/jobs.yml @@ -21,6 +21,7 @@ JOB: - x-pack-ciGroup4 - x-pack-ciGroup5 - x-pack-ciGroup6 + - x-pack-ciGroup7 # `~` is yaml for `null` exclude: ~ diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh index 4df6041639116..11b16ba27a328 100755 --- a/test/scripts/jenkins_xpack_ci_group.sh +++ b/test/scripts/jenkins_xpack_ci_group.sh @@ -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" diff --git a/x-pack/test/functional/apps/infra/index.ts b/x-pack/test/functional/apps/infra/index.ts index 117f309d9470e..322aea31e1263 100644 --- a/x-pack/test/functional/apps/infra/index.ts +++ b/x-pack/test/functional/apps/infra/index.ts @@ -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')); }); From 749707eec2d24c01c1c7a5be764963ff57046fb5 Mon Sep 17 00:00:00 2001 From: Nicholas Dziedzic Date: Tue, 4 Dec 2018 15:32:25 -0500 Subject: [PATCH 5/5] Phantom tests should be in group 7. --- x-pack/test/reporting/api/phantom_tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/test/reporting/api/phantom_tests.js b/x-pack/test/reporting/api/phantom_tests.js index 5fb9f8d5ba155..62993ec40208e 100644 --- a/x-pack/test/reporting/api/phantom_tests.js +++ b/x-pack/test/reporting/api/phantom_tests.js @@ -11,7 +11,7 @@ export default function ({ loadTestFile, getService }) { const kibanaServer = getService('kibanaServer'); describe('phantom', function () { - this.tags('ciGroup3'); + this.tags('ciGroup7'); before(async () => { await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH);