Skip to content

Commit

Permalink
Transition for TeamCity
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
  • Loading branch information
Tyler Smalley committed Jan 27, 2021
1 parent 1b976eb commit 5751b50
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 13 deletions.
4 changes: 4 additions & 0 deletions .ci/teamcity/default/jest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/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)
13 changes: 13 additions & 0 deletions .ci/teamcity/oss/jest.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/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 --verbose
10 changes: 10 additions & 0 deletions .ci/teamcity/oss/jest_integration.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

set -euo pipefail

source "$(dirname "${0}")/../util.sh"

export JOB=kibana-oss-jest-integration

checks-reporter-with-killswitch "OSS Jest Integration Tests" \
node scripts/jest_integration --ci --verbose
2 changes: 1 addition & 1 deletion .ci/teamcity/tests/jest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ source "$(dirname "${0}")/../util.sh"
export JOB=kibana-jest

checks-reporter-with-killswitch "Jest Unit Tests" \
node scripts/jest --ci --verbose --maxWorkers=10 --coverage
node scripts/jest --ci --verbose --coverage
10 changes: 0 additions & 10 deletions .ci/teamcity/tests/jest_integration.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .teamcity/src/builds/test/JestIntegration.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ object JestIntegration : BuildType({
description = "Executes Jest Integration Tests"

steps {
runbld("Jest Integration", "./.ci/teamcity/tests/jest_integration.sh")
runbld("Jest Integration", "./.ci/teamcity/oss/jest_integration.sh")
}

addTestSettings()
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/

module.exports = {
preset: '@kbn/test',
rootDir: '.',
projects: [
'<rootDir>/packages/*/jest.config.js',
Expand All @@ -16,5 +17,4 @@ module.exports = {
'<rootDir>/test/*/jest.config.js',
'<rootDir>/x-pack/plugins/*/jest.config.js',
],
reporters: ['default', '<rootDir>/packages/kbn-test/target/jest/junit_reporter'],
};

0 comments on commit 5751b50

Please sign in to comment.