Repository navigation
Commit b2144da
committed
local integration tests: stay runnable on dd-trace v6 trees
The pack step ran `yarn install --frozen-lockfile` directly. On a tree that
pins dd-trace v6 (engines node >=22) with a host Node older than 22 — e.g.
this repo's GitHub Actions runner image, which sets up Node 18.12 — that
install fails with "The engine \"node\" is incompatible with this module",
so every local integration test leg on a v6 PR fails before any container
is built.
Two changes, both no-ops on the current v5 tree:
- Pack step: when scripts/install_deps.sh exists (v6 world), install
through it with TARGET_NODE_MAJOR=$RUNTIME_PARAM (default 22) so the v5
fallback line is installed for older runtimes and --ignore-engines
covers v6 on older hosts. The script restores package.json/yarn.lock on
exit, so the worktree stays clean. Without it, fall back to the previous
plain yarn install.
- Container builds: pass a DD_TRACE_VERSION build-arg resolved through
scripts/dd_trace_versions.sh (v5 line for node <22) so the fixture image
installs a tracer its runtime can actually run. Current fixture
Dockerfiles declare no such ARG, so docker only warns; v6-world fixtures
consume it via npm pkg set.
Verified:
- v5 tree: RUNTIME_PARAM=22 CASE_PARAM=container-cjs passes end to end.
- v6 tree (onzia/moreddtrace6 + this harness): node18 leg installs
dd-trace 5.124.0 and node22 leg installs 6.12.0 on a Node 18 host (the
original failure scenario), containers build and run; the only remaining
diffs are the expected tracer-version snapshot drift (5.118 -> 5.124/6.x
drop empty "links": [] and populate dd_trace meta), which the v6 PR owns
regenerating, same as it already did for the AWS snapshots.1 parent 866639a commit b2144da
2 files changed
Lines changed: 33 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
44 | 44 | | |
45 | 45 | | |
46 | 46 | | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
47 | 54 | | |
48 | 55 | | |
49 | 56 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
331 | 331 | | |
332 | 332 | | |
333 | 333 | | |
334 | | - | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
335 | 348 | | |
336 | 349 | | |
337 | 350 | | |
| |||
488 | 501 | | |
489 | 502 | | |
490 | 503 | | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
| 509 | + | |
| 510 | + | |
| 511 | + | |
| 512 | + | |
| 513 | + | |
| 514 | + | |
491 | 515 | | |
492 | 516 | | |
493 | 517 | | |
| |||
510 | 534 | | |
511 | 535 | | |
512 | 536 | | |
| 537 | + | |
513 | 538 | | |
514 | 539 | | |
515 | 540 | | |
| |||
0 commit comments