Skip to content

Commit bb61b06

Browse files
authored
move slow test framework integration tests to separate jobs (#2955)
1 parent 36524c8 commit bb61b06

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

.github/workflows/project.yml

+15
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,21 @@ jobs:
2828
- run: sudo sysctl -w kernel.core_pattern='|/bin/false'
2929
- run: yarn test:integration
3030

31+
integration-ci:
32+
strategy:
33+
matrix:
34+
version: [14, latest]
35+
framework: [cucumber, cypress, playwright]
36+
runs-on: ubuntu-latest
37+
steps:
38+
- uses: actions/checkout@v3
39+
- uses: ./.github/actions/node/setup
40+
- run: yarn install
41+
- uses: actions/setup-node@v3
42+
with:
43+
node-version: ${{ matrix.version }}
44+
- run: yarn test:integration:${{ matrix.framework }}
45+
3146
lint:
3247
runs-on: ubuntu-latest
3348
steps:

integration-tests/cucumber.spec.js integration-tests/cucumber/cucumber.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ const {
1010
createSandbox,
1111
getCiVisAgentlessConfig,
1212
getCiVisEvpProxyConfig
13-
} = require('./helpers')
14-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
13+
} = require('../helpers')
14+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
1515
const {
1616
TEST_STATUS,
1717
TEST_COMMAND,
@@ -23,7 +23,7 @@ const {
2323
TEST_MODULE_ITR_SKIPPING_ENABLED,
2424
TEST_ITR_TESTS_SKIPPED,
2525
TEST_CODE_COVERAGE_LINES_TOTAL
26-
} = require('../packages/dd-trace/src/plugins/util/test')
26+
} = require('../../packages/dd-trace/src/plugins/util/test')
2727

2828
const isOldNode = semver.satisfies(process.version, '<=12')
2929
const versions = ['7.0.0', isOldNode ? '8' : 'latest']

integration-tests/cypress.spec.js integration-tests/cypress/cypress.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ const {
1010
createSandbox,
1111
getCiVisAgentlessConfig,
1212
getCiVisEvpProxyConfig
13-
} = require('./helpers')
14-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
15-
const webAppServer = require('./ci-visibility/web-app-server')
13+
} = require('../helpers')
14+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
15+
const webAppServer = require('../ci-visibility/web-app-server')
1616
const {
1717
TEST_STATUS,
1818
TEST_COMMAND,
1919
TEST_MODULE,
2020
TEST_FRAMEWORK_VERSION,
2121
TEST_TOOLCHAIN
22-
} = require('../packages/dd-trace/src/plugins/util/test')
22+
} = require('../../packages/dd-trace/src/plugins/util/test')
2323

2424
// TODO: remove when 2.x support is removed.
2525
// This is done because from playwright@>=1.22.0 node 12 is not supported

integration-tests/playwright.spec.js integration-tests/playwright/playwright.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ const {
1010
createSandbox,
1111
getCiVisAgentlessConfig,
1212
getCiVisEvpProxyConfig
13-
} = require('./helpers')
14-
const { FakeCiVisIntake } = require('./ci-visibility-intake')
15-
const webAppServer = require('./ci-visibility/web-app-server')
16-
const { TEST_STATUS } = require('../packages/dd-trace/src/plugins/util/test')
13+
} = require('../helpers')
14+
const { FakeCiVisIntake } = require('../ci-visibility-intake')
15+
const webAppServer = require('../ci-visibility/web-app-server')
16+
const { TEST_STATUS } = require('../../packages/dd-trace/src/plugins/util/test')
1717

1818
// TODO: remove when 2.x support is removed.
1919
// This is done because from playwright@>=1.22.0 node 12 is not supported

package.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
"test:plugins:upstream": "node ./packages/dd-trace/test/plugins/suite.js",
3333
"test:profiler": "tap \"packages/dd-trace/test/profiling/**/*.spec.js\"",
3434
"test:profiler:ci": "npm run test:profiler -- --coverage --nyc-arg=--include=\"packages/dd-trace/src/profiling/**/*.js\"",
35-
"test:integration": "mocha --colors --timeout 30000 \"integration-tests/**/*.spec.js\"",
35+
"test:integration": "mocha --colors --timeout 30000 \"integration-tests/*.spec.js\"",
36+
"test:integration:cucumber": "mocha --colors --timeout 30000 \"integration-tests/cucumber/*.spec.js\"",
37+
"test:integration:cypress": "mocha --colors --timeout 30000 \"integration-tests/cypress/*.spec.js\"",
38+
"test:integration:playwright": "mocha --colors --timeout 30000 \"integration-tests/playwright/*.spec.js\"",
3639
"test:shimmer": "mocha --colors 'packages/datadog-shimmer/test/**/*.spec.js'",
3740
"test:shimmer:ci": "nyc --no-clean --include 'packages/datadog-shimmer/src/**/*.js' -- npm run test:shimmer",
3841
"leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",

0 commit comments

Comments
 (0)