run endpoint tests with coverage

elastic · Apr 15, 2020 · 82cae66 · 82cae66
1 parent 08aa214
commit 82cae66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/test/scripts/jenkins_ci_group.sh b/test/scripts/jenkins_ci_group.sh
@@ -22,7 +22,7 @@ else
 
   echo " -> running tests from the clone folder"
   #yarn run grunt "run:functionalTests_ciGroup${CI_GROUP}";
-  node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"  --config test/functional/config.coverage.js || true;
+  node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"  --exclude-tag "skipCoverage" || true;
 
   if [[ -d target/kibana-coverage/functional ]]; then
     echo " -> replacing kibana${CI_GROUP} with kibana in json files"

diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
@@ -39,7 +39,7 @@ else
   # build runtime for canvas
   echo "NODE_ENV=$NODE_ENV"
   node ./legacy/plugins/canvas/scripts/shareable_runtime
-  node scripts/jest --ci --verbose --coverage
+  node --max-old-space-size=6144 scripts/jest --ci --verbose --coverage
   # rename file in order to be unique one
   test -f ../target/kibana-coverage/jest/coverage-final.json \
     && mv ../target/kibana-coverage/jest/coverage-final.json \

diff --git a/test/scripts/jenkins_xpack_ci_group.sh b/test/scripts/jenkins_xpack_ci_group.sh
@@ -23,7 +23,7 @@ else
   cd "kibana${CI_GROUP}/x-pack"
 
   echo " -> running tests from the clone folder"
-  node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"  --config test/functional/config.coverage.js || true;
+  node scripts/functional_tests --debug --include-tag "ciGroup$CI_GROUP"  --exclude-tag "skipCoverage" || true;
 
   if [[ -d ../target/kibana-coverage/functional ]]; then
     echo " -> replacing kibana${CI_GROUP} with kibana in json files"

diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-const alwaysImportedTests = [require.resolve('../test/functional/config.js')];
+const alwaysImportedTests = [
+  // require.resolve('../test/functional/config.js'),
+  require.resolve('../test/functional_endpoint_ingest_failure/config.ts'),
+  require.resolve('../test/functional_endpoint/config.ts'),
+];
 const onlyNotInCoverageTests = [
   require.resolve('../test/reporting/configs/chromium_api.js'),
   require.resolve('../test/reporting/configs/chromium_functional.js'),
@@ -43,8 +47,6 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/licensing_plugin/config.ts'),
   require.resolve('../test/licensing_plugin/config.public.ts'),
   require.resolve('../test/licensing_plugin/config.legacy.ts'),
-  require.resolve('../test/functional_endpoint_ingest_failure/config.ts'),
-  require.resolve('../test/functional_endpoint/config.ts'),
 ];
 
 require('@kbn/plugin-helpers').babelRegister();