Skip to content

Commit 5078d6b

Browse files
authored
Use noble images for CI (#3798)
Signed-off-by: Bob Weinand <bob.weinand@datadoghq.com>
1 parent dcb5fff commit 5078d6b

7 files changed

Lines changed: 20 additions & 20 deletions

File tree

.claude/ci/appsec-gradle-integration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ file.
88

99
| CI Job | Image | What it does |
1010
|--------|-------|-------------|
11-
| `appsec integration tests: [{target}]` | `docker:24.0.4-gbi-focal` | Gradle integration tests with C++ helper (release/zts variants) |
11+
| `appsec integration tests: [{target}]` | `docker:29.4.0-noble` | Gradle integration tests with C++ helper (release/zts variants) |
1212
| `appsec integration tests (helper-rust): [{target}]` | same | Same tests with Rust helper (`-PuseHelperRust`); includes `debug` variant |
1313
| `appsec integration tests (ssi): [{target}]` | same | SSI mode (PHP 8.3 only) |
1414
| `helper-rust build and test` | same | `cargo fmt --check` + build + unit tests |

.claude/ci/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ Covers: `compile extension: debug/release/zts/...` (tracer pipeline),
393393
### Group E — Docker-in-Docker Gradle integration tests (appsec)
394394

395395
Runner: `docker-in-docker:amd64`
396-
Image: `docker:24.0.4-gbi-focal`
396+
Image: `docker:29.4.0-noble`
397397
Script: installs Java → Gradle → Gradle spins up Docker containers (PHP + helper + test-agent)
398398

399399
**[appsec-gradle-integration.md](appsec-gradle-integration.md)**
@@ -409,7 +409,7 @@ Covers: `appsec integration tests [test7.0..test8.5-*]`,
409409
### Group F — System tests
410410

411411
Runner: `docker-in-docker:amd64`
412-
Image: `docker:24.0.4-gbi-focal`
412+
Image: `docker:29.4.0-noble`
413413
Python-based `datadog/system-tests` framework; lives in `../../../system-tests/`
414414

415415
**[system-tests.md](system-tests.md)**
@@ -429,7 +429,7 @@ credentials; Vagrant path available but limited.
429429
### Group G — Docker-in-Docker package verification
430430

431431
Runner: `docker-in-docker:amd64`
432-
Image: `docker:24.0.4-gbi-focal`
432+
Image: `docker:29.4.0-noble`
433433
Distinct from system tests; uses a different test harness.
434434

435435
**[package-dind-verification.md](package-dind-verification.md)**

.claude/ci/package-dind-verification.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Docker-in-Docker runners because they spin up containers internally.
1919

2020
| CI Job | Image | What it does |
2121
|--------|-------|--------------|
22-
| `framework test: [{suite}]` | `docker:24.0.4-gbi-focal` | Spins up a framework-specific Docker Compose stack and runs the framework's own test suite with ddtrace installed |
23-
| `installer tests` | `docker:24.0.4-gbi-focal` | Runs `make -C dockerfiles/verify_packages test_installer`; verifies `datadog-setup.php` installer works on both amd64 and arm64 packages |
24-
| `randomized tests: [amd64, {no-asan,asan}, {1..5}]` | `docker:24.0.4-gbi-focal` | Generates random PHP scenarios and runs them with ddtrace for 1m30s each; checks for crashes and unexpected behavior |
22+
| `framework test: [{suite}]` | `docker:29.4.0-noble` | Spins up a framework-specific Docker Compose stack and runs the framework's own test suite with ddtrace installed |
23+
| `installer tests` | `docker:29.4.0-noble` | Runs `make -C dockerfiles/verify_packages test_installer`; verifies `datadog-setup.php` installer works on both amd64 and arm64 packages |
24+
| `randomized tests: [amd64, {no-asan,asan}, {1..5}]` | `docker:29.4.0-noble` | Generates random PHP scenarios and runs them with ddtrace for 1m30s each; checks for crashes and unexpected behavior |
2525

2626
Runner: `docker-in-docker:amd64`
2727
Matrix (`framework test`): `{flow, flow_no_ddtrace, mongodb-driver, mongodb-driver_no_ddtrace, phpredis3, phpredis3_no_ddtrace, phpredis4, phpredis4_no_ddtrace, phpredis5, phpredis5_no_ddtrace, wordpress, wordpress_no_ddtrace}`

.claude/ci/system-tests-onboarding.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The shared template expands each scenario group into jobs that:
4343
| `docker-ssi` | Docker-based SSI (no VM, uses Docker-in-Docker) |
4444

4545
Runner: `docker-in-docker:amd64` (all scenario groups)
46-
Image: `docker:24.0.4-gbi-focal`
46+
Image: `docker:29.4.0-noble`
4747

4848
### CI secrets
4949

.gitlab/ci-images.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ CentOS:
1616
needs: []
1717
tags: ["arch:amd64"]
1818
timeout: 4h
19-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
19+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
2020
parallel:
2121
matrix:
2222
- PHP_VERSION:
@@ -45,7 +45,7 @@ Alpine:
4545
needs: []
4646
tags: ["arch:amd64"]
4747
timeout: 4h
48-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
48+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
4949
parallel:
5050
matrix:
5151
- PHP_VERSION:
@@ -74,7 +74,7 @@ Bookworm:
7474
needs: []
7575
tags: ["arch:amd64"]
7676
timeout: 4h
77-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
77+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
7878
parallel:
7979
matrix:
8080
- PHP_VERSION:
@@ -105,7 +105,7 @@ Buster:
105105
needs: []
106106
tags: ["arch:amd64"]
107107
timeout: 4h
108-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
108+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
109109
parallel:
110110
matrix:
111111
- PHP_VERSION:

.gitlab/generate-appsec.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
.docker_push_job:
6161
stage: docker-build
62-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
62+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
6363
before_script:
6464
<?php echo $ecrLoginSnippet, "\n"; ?>
6565
<?php dockerhub_login() ?>
@@ -101,7 +101,7 @@
101101

102102
.appsec_integration_tests:
103103
stage: test
104-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal # TODO: use a proper docker image with java pre-installed?
104+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble # TODO: use a proper docker image with java pre-installed?
105105
tags: [ "docker-in-docker:amd64" ]
106106
variables:
107107
KUBERNETES_CPU_REQUEST: 8
@@ -194,7 +194,7 @@
194194

195195
"helper-rust build and test":
196196
stage: test
197-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
197+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
198198
tags: [ "docker-in-docker:amd64" ]
199199
interruptible: true
200200
rules:
@@ -229,7 +229,7 @@
229229

230230
"helper-rust code coverage":
231231
stage: test
232-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
232+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
233233
tags: [ "docker-in-docker:amd64" ]
234234
interruptible: true
235235
rules:
@@ -295,7 +295,7 @@
295295

296296
"helper-rust integration coverage":
297297
stage: test
298-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
298+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
299299
tags: [ "docker-in-docker:amd64" ]
300300
interruptible: true
301301
rules:

.gitlab/generate-package.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@
787787

788788
.randomized_tests:
789789
stage: verify
790-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal # TODO: use a proper docker image with make, php and git pre-installed
790+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble # TODO: use a proper docker image with make, php and git pre-installed
791791
variables:
792792
KUBERNETES_CPU_REQUEST: 7
793793
KUBERNETES_MEMORY_REQUEST: 30Gi
@@ -861,7 +861,7 @@
861861

862862
"installer tests":
863863
stage: verify
864-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
864+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
865865
tags: [ "docker-in-docker:amd64" ]
866866
needs:
867867
- job: "package extension: [amd64, x86_64-unknown-linux-gnu]"
@@ -909,7 +909,7 @@
909909

910910
"framework test":
911911
stage: verify
912-
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
912+
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
913913
tags: [ "docker-in-docker:amd64" ]
914914
variables:
915915
KUBERNETES_CPU_REQUEST: 2

0 commit comments

Comments
 (0)