Skip to content

Commit

Permalink
Bump Nodejs runtime tests to Node.js 22.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 640947548
  • Loading branch information
ayushr2 authored and gvisor-bot committed Jun 6, 2024
1 parent 4bdb7e9 commit e9e2a18
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .buildkite/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ steps:
- <<: *common
<<: *docker
label: ":node: NodeJS runtime tests"
command: make nodejs16.13.2-runtime-tests RUNTIME_ARGS=--directfs
command: make nodejs22.2.0-runtime-tests RUNTIME_ARGS=--directfs
parallelism: 10
agents:
<<: *platform_specific_agents
Expand Down Expand Up @@ -571,7 +571,7 @@ steps:
- <<: *common
<<: *docker
label: ":node: NodeJS runtime tests (goferfs)"
command: make nodejs16.13.2-runtime-tests RUNTIME_ARGS=--directfs=false
command: make nodejs22.2.0-runtime-tests RUNTIME_ARGS=--directfs=false
parallelism: 10
if: build.branch == "master"
agents:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM ubuntu:bionic
FROM ubuntu:jammy
RUN apt-get update && apt-get install -y \
curl \
dumb-init \
g++ \
make \
python \
python3.8
python3.10

WORKDIR /root
ARG VERSION=v16.13.2
RUN curl -o node-${VERSION}.tar.gz https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.gz
RUN tar -zxf node-${VERSION}.tar.gz
ARG VERSION=v22.2.0
RUN curl -o node-${VERSION}.tar.gz https://nodejs.org/dist/${VERSION}/node-${VERSION}.tar.gz \
&& tar -zxf node-${VERSION}.tar.gz \
&& rm -f node-${VERSION}.tar.gz

WORKDIR /root/node-${VERSION}
RUN ./configure
RUN make test-build
RUN make -j $(nproc) test-build

# Including dumb-init emulates the Linux "init" process, preventing the failure
# of tests involving worker processes.
Expand Down
4 changes: 2 additions & 2 deletions test/runtimes/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ runtime_test(
)

runtime_test(
name = "nodejs16.13.2",
exclude_file = "exclude/nodejs16.13.2.csv",
name = "nodejs22.2.0",
exclude_file = "exclude/nodejs22.2.0.csv",
lang = "nodejs",
shard_count = most_shards,
)
Expand Down
4 changes: 2 additions & 2 deletions test/runtimes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ The following `make` targets will run an entire runtime test suite locally.
Note: java runtime test take 1+ hours with 16 cores.

Language | Version | Running the test suite
-------- | ------- | ----------------------------------
-------- | ------- | ---------------------------------
Go | 1.22 | `make go1.22-runtime-tests`
Java | 21 | `make java21-runtime-tests`
NodeJS | 16.13.2 | `make nodejs16.13.2-runtime-tests`
NodeJS | 22.2.0 | `make nodejs22.2.0-runtime-tests`
Php | 8.3.7 | `make php8.3.7-runtime-tests`
Python | 3.12.3 | `make python3.12.3-runtime-tests`

Expand Down
15 changes: 0 additions & 15 deletions test/runtimes/exclude/nodejs16.13.2.csv

This file was deleted.

13 changes: 13 additions & 0 deletions test/runtimes/exclude/nodejs22.2.0.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
test name,bug id,comment
benchmark/test-benchmark-napi.js,,Broken test
internet/test-dgram-multicast-ssm-multi-process.js,b/344592701,
internet/test-dgram-multicast-ssmv6-multi-process.js,,Broken test
internet/test-dns-ipv4.js,,Broken test (Flaky because it relies on external network)
internet/test-inspector-help-page.js,,Broken test
internet/test-net-autoselectfamily-events-failure.js,,Broken test
internet/test-snapshot-dns-resolve.js,,Broken test (Flaky because it relies on external network)
pseudo-tty/test-stdout-read.js,b/162801321,
parallel/test-child-process-set-blocking.js,,Broken test
pummel/test-child-process-spawn-loop.js,,Broken test
tick-processor/test-tick-processor-builtin.js,,Broken test
v8-updates/test-linux-perf.js,,Broken test
2 changes: 1 addition & 1 deletion test/runtimes/proctor/lib/nodejs.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ func (nodejsRunner) ListTests() ([]string, error) {
// TestCmds implements TestRunner.TestCmds.
func (nodejsRunner) TestCmds(tests []string) []*exec.Cmd {
args := append([]string{filepath.Join("tools", "test.py"), "--timeout=180"}, tests...)
return []*exec.Cmd{exec.Command("/usr/bin/python", args...)}
return []*exec.Cmd{exec.Command("/usr/bin/python3.10", args...)}
}

0 comments on commit e9e2a18

Please sign in to comment.