Revert "[7.x] [CI] Combines Jest test jobs (#85850) (#89432)"

This reverts commit e36dfcd.

.ci/es-snapshots/Jenkinsfile_verify_es

@@ -29,6 +29,7 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
+          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),

.ci/jobs.yml

@@ -2,6 +2,7 @@
 
 JOB:
   - kibana-intake
+  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2

.ci/teamcity/default/jest.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-default-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest x-pack --ci --verbose --maxWorkers=5

.ci/teamcity/oss/jest.sh

@@ -1,13 +1,10 @@
 #!/bin/bash
 
-# This file is temporary and can be removed once #85850 has been
-# merged and the changes included in open PR's (~3 days after merging)
-
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --maxWorkers=5 --verbose
+checks-reporter-with-killswitch "OSS Jest Unit Tests" \
+  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5

.teamcity/src/Extensions.kt

@@ -20,21 +20,20 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
-    target/junit/**/*
     target/kibana-*
-    target/kibana-coverage/**/*
-    target/kibana-security-solution/**/*.png
     target/test-metrics/*
+    target/kibana-security-solution/**/*.png
+    target/junit/**/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/diff/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/session/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/diff/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/session/*.png
-    x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/diff/*.png
     x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/functional/apps/reporting/reports/session/*.pdf
   """.trimIndent()
 
 fun BuildType.addTestSettings() {

.teamcity/src/builds/test/AllTests.kt

@@ -9,5 +9,5 @@ object AllTests : BuildType({
   description = "All Non-Functional Tests"
   type = Type.COMPOSITE
 
-  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, XPackJest, JestIntegration, OssApiServerIntegration)
 })

.teamcity/src/builds/test/Jest.kt

@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "./.ci/teamcity/tests/jest.sh")
+    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
   }
 
   addTestSettings()

.teamcity/src/builds/test/XPackJest.kt

@@ -0,0 +1,19 @@
+package builds.test
+
+import addTestSettings
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import kibanaAgent
+import runbld
+
+object XPackJest : BuildType({
+  name = "X-Pack Jest Unit"
+  description = "Executes X-Pack Jest Unit Tests"
+
+  kibanaAgent(16)
+
+  steps {
+    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
+  }
+
+  addTestSettings()
+})

.teamcity/src/projects/Kibana.kt

@@ -77,6 +77,7 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
           name = "Jest"
 
           buildType(Jest)
+          buildType(XPackJest)
           buildType(JestIntegration)
         }
 

jest.config.integration.js

@@ -17,15 +17,12 @@ module.exports = {
   testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
     (pattern) => !pattern.includes('integration_tests')
   ),
-  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
   reporters: [
     'default',
     [
       '<rootDir>/packages/kbn-test/target/jest/junit_reporter',
       { reportName: 'Jest Integration Tests' },
     ],
   ],
-  coverageReporters: !!process.env.CI
-    ? [['json', { file: 'jest-integration.json' }]]
-    : ['html', 'text'],
+  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
 };

jest.config.js

@@ -7,14 +7,6 @@
  */
 
 module.exports = {
-  preset: '@kbn/test',
   rootDir: '.',
-  projects: [
-    '<rootDir>/packages/*/jest.config.js',
-    '<rootDir>/src/*/jest.config.js',
-    '<rootDir>/src/legacy/*/jest.config.js',
-    '<rootDir>/src/plugins/*/jest.config.js',
-    '<rootDir>/test/*/jest.config.js',
-    '<rootDir>/x-pack/plugins/*/jest.config.js',
-  ],
+  projects: [...require('./jest.config.oss').projects, ...require('./x-pack/jest.config').projects],
 };

jest.config.oss.js

@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * and the Server Side Public License, v 1; you may not use this file except in
+ * compliance with, at your election, the Elastic License or the Server Side
+ * Public License, v 1.
+ */
+
+module.exports = {
+  rootDir: '.',
+  projects: [
+    '<rootDir>/packages/*/jest.config.js',
+    '<rootDir>/src/*/jest.config.js',
+    '<rootDir>/src/legacy/*/jest.config.js',
+    '<rootDir>/src/plugins/*/jest.config.js',
+    '<rootDir>/test/*/jest.config.js',
+  ],
+  reporters: ['default', '<rootDir>/packages/kbn-test/target/jest/junit_reporter'],
+};

packages/kbn-test/jest-preset.js

@@ -19,7 +19,7 @@ module.exports = {
   coveragePathIgnorePatterns: ['/node_modules/', '.*\\.d\\.ts'],
 
   // A list of reporter names that Jest uses when writing coverage reports
-  coverageReporters: !!process.env.CI ? [['json', { file: 'jest.json' }]] : ['html', 'text'],
+  coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
 
   // An array of file extensions your modules use
   moduleFileExtensions: ['js', 'mjs', 'json', 'ts', 'tsx', 'node'],

test/scripts/jenkins_xpack.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source test/scripts/jenkins_test_setup.sh
+
+echo " -> Running jest tests"
+./test/scripts/test/xpack_jest_unit.sh

test/scripts/test/jest_integration.sh

@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node scripts/jest_integration --ci --verbose --coverage
+  node scripts/jest_integration --ci --verbose

test/scripts/test/jest_unit.sh

@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --ci --verbose --maxWorkers=6 --coverage
+  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5

test/scripts/test/xpack_jest_unit.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+checks-reporter-with-killswitch "X-Pack Jest" \
+  node scripts/jest x-pack --ci --verbose --maxWorkers=5

vars/kibanaPipeline.groovy

@@ -167,21 +167,20 @@ def uploadGcsArtifact(uploadPrefix, pattern) {
 def withGcsArtifactUpload(workerName, closure) {
   def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}"
   def ARTIFACT_PATTERNS = [
-    'target/junit/**/*',
     'target/kibana-*',
-    'target/kibana-coverage/**/*',
-    'target/kibana-security-solution/**/*.png',
     'target/test-metrics/*',
+    'target/kibana-security-solution/**/*.png',
+    'target/junit/**/*',
     'target/test-suites-ci-plan.json',
-    'test/**/screenshots/diff/*.png',
-    'test/**/screenshots/failure/*.png',
     'test/**/screenshots/session/*.png',
+    'test/**/screenshots/failure/*.png',
+    'test/**/screenshots/diff/*.png',
     'test/functional/failure_debug/html/*.html',
-    'x-pack/test/**/screenshots/diff/*.png',
-    'x-pack/test/**/screenshots/failure/*.png',
     'x-pack/test/**/screenshots/session/*.png',
-    'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
+    'x-pack/test/**/screenshots/failure/*.png',
+    'x-pack/test/**/screenshots/diff/*.png',
     'x-pack/test/functional/failure_debug/html/*.html',
+    'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
   ]
 
   withEnv([

vars/tasks.groovy

@@ -35,6 +35,7 @@ def test() {
 
     kibanaPipeline.scriptTask('Jest Unit Tests', 'test/scripts/test/jest_unit.sh'),
     kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
+    kibanaPipeline.scriptTask('X-Pack Jest Unit Tests', 'test/scripts/test/xpack_jest_unit.sh'),
   ])
 }
 

x-pack/jest.config.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+module.exports = {
+  rootDir: '..',
+  projects: ['<rootDir>/x-pack/plugins/*/jest.config.js'],
+  reporters: [
+    'default',
+    ['<rootDir>/packages/kbn-test/target/jest/junit_reporter', { reportName: 'X-Pack Jest Tests' }],
+  ],
+};