fix(tests): update VSCode runner to use 24.04

gagik · gagik · commit f03e179b69c8 · 2025-02-02T11:10:34.000+01:00
diff --git a/.evergreen.yml b/.evergreen.yml
@@ -3597,9 +3597,9 @@ functions:
           set -e
           {
           source .evergreen/setup-env.sh
-          (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
+          (cd scripts/docker && docker build -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)
           docker run \
-            --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
+            --rm -v $PWD:/tmp/build ubuntu24.04-xvfb \
             -c 'cd /tmp/build && ./testing/test-vscode.sh'
           }
   test_connectivity:
diff --git a/.evergreen/evergreen.yml.in b/.evergreen/evergreen.yml.in
@@ -306,9 +306,9 @@ functions:
           set -e
           {
           source .evergreen/setup-env.sh
-          (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)
+          (cd scripts/docker && docker build -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)
           docker run \
-            --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \
+            --rm -v $PWD:/tmp/build ubuntu24.04-xvfb \
             -c 'cd /tmp/build && ./testing/test-vscode.sh'
           }
   test_connectivity:
diff --git a/scripts/docker/ubuntu24.04-xvfb.Dockerfile b/scripts/docker/ubuntu24.04-xvfb.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update

Original file line number	Diff line number	Diff line change
`@@ -3597,9 +3597,9 @@ functions:`
`3597`	`3597`	`set -e`
`3598`	`3598`	`{`
`3599`	`3599`	`source .evergreen/setup-env.sh`
`3600`		`- (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)`
	`3600`	`+ (cd scripts/docker && docker build -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)`
`3601`	`3601`	`docker run \`
`3602`		`- --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \`
	`3602`	`+ --rm -v $PWD:/tmp/build ubuntu24.04-xvfb \`
`3603`	`3603`	`-c 'cd /tmp/build && ./testing/test-vscode.sh'`
`3604`	`3604`	`}`
`3605`	`3605`	`test_connectivity:`
Original file line number	Diff line number	Diff line change
`@@ -306,9 +306,9 @@ functions:`
`306`	`306`	`set -e`
`307`	`307`	`{`
`308`	`308`	`source .evergreen/setup-env.sh`
`309`		`- (cd scripts/docker && docker build -t ubuntu22.04-xvfb -f ubuntu22.04-xvfb.Dockerfile .)`
	`309`	`+ (cd scripts/docker && docker build -t ubuntu24.04-xvfb -f ubuntu24.04-xvfb.Dockerfile .)`
`310`	`310`	`docker run \`
`311`		`- --rm -v $PWD:/tmp/build ubuntu22.04-xvfb \`
	`311`	`+ --rm -v $PWD:/tmp/build ubuntu24.04-xvfb \`
`312`	`312`	`-c 'cd /tmp/build && ./testing/test-vscode.sh'`
`313`	`313`	`}`
`314`	`314`	`test_connectivity:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:22.04`
	`1`	`+FROM ubuntu:24.04`
`2`	`2`
`3`	`3`	`ENV DEBIAN_FRONTEND=noninteractive`
`4`	`4`	`RUN apt-get update`