Updates to Jest configuration (#125727) (#125754)

(cherry picked from commit e9d82d1) # Conflicts: # .buildkite/scripts/steps/code_coverage/jest.sh
elastic · Feb 16, 2022 · 251dcfc · 251dcfc
1 parent baf7be9
commit 251dcfc
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 56 deletions.
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -65,6 +65,7 @@ steps:
 
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
+    parallelism: 2
     agents:
       queue: n2-4
     timeout_in_minutes: 120

diff --git a/.buildkite/scripts/steps/test/jest.sh b/.buildkite/scripts/steps/test/jest.sh
@@ -10,4 +10,4 @@ is_test_execution_step
 
 echo '--- Jest'
 checks-reporter-with-killswitch "Jest Unit Tests $((BUILDKITE_PARALLEL_JOB+1))" \
-  .buildkite/scripts/steps/test/jest_parallel.sh
+  .buildkite/scripts/steps/test/jest_parallel.sh jest.config.js
diff --git a/.buildkite/scripts/steps/test/jest_parallel.sh b/.buildkite/scripts/steps/test/jest_parallel.sh
@@ -25,6 +25,6 @@ while read -r config; do
 
   ((i=i+1))
 # uses heredoc to avoid the while loop being in a sub-shell thus unable to overwrite exitCode
-done <<< "$(find src x-pack packages -name ${1:-jest.config.js} -not -path "*/__fixtures__/*" | sort)"
+done <<< "$(find src x-pack packages -name "$1" -not -path "*/__fixtures__/*" | sort)"
 
 exit $exitCode
diff --git a/jest.config.integration.js b/jest.config.integration.js
diff --git a/jest.config.js b/jest.config.js
diff --git a/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts b/packages/kbn-test/src/jest/run_check_jest_configs_cli.ts
@@ -10,7 +10,7 @@ import { writeFileSync } from 'fs';
 import path from 'path';
 import Mustache from 'mustache';
 
-import { run } from '@kbn/dev-utils';
+import { run, createFailError } from '@kbn/dev-utils';
 import { REPO_ROOT } from '@kbn/utils';
 
 import { JestConfigs, CONFIG_NAMES } from './configs';
@@ -72,7 +72,7 @@ export async function runCheckJestConfigsCli() {
             log.info('created %s', file);
           });
         } else {
-          log.info(
+          throw createFailError(
             `Run 'node scripts/check_jest_configs --fix' to create the missing config files`
           );
         }

diff --git a/scripts/jest_integration.js b/scripts/jest_integration.js
@@ -9,4 +9,4 @@
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
 process.argv.push('--runInBand');
 
-require('@kbn/test').runJest('jest.config.integration.js');
+require('@kbn/test').runJest('jest.integration.config.js');