Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .claude/ci/appsec-gradle-integration.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ file.

| CI Job | Image | What it does |
|--------|-------|-------------|
| `appsec integration tests: [{target}]` | `docker:24.0.4-gbi-focal` | Gradle integration tests with C++ helper (release/zts variants) |
| `appsec integration tests: [{target}]` | `docker:29.4.0-noble` | Gradle integration tests with C++ helper (release/zts variants) |
| `appsec integration tests (helper-rust): [{target}]` | same | Same tests with Rust helper (`-PuseHelperRust`); includes `debug` variant |
| `appsec integration tests (ssi): [{target}]` | same | SSI mode (PHP 8.3 only) |
| `helper-rust build and test` | same | `cargo fmt --check` + build + unit tests |
Expand Down
6 changes: 3 additions & 3 deletions .claude/ci/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ Covers: `compile extension: debug/release/zts/...` (tracer pipeline),
### Group E — Docker-in-Docker Gradle integration tests (appsec)

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

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

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

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

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

→ **[package-dind-verification.md](package-dind-verification.md)**
Expand Down
6 changes: 3 additions & 3 deletions .claude/ci/package-dind-verification.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Docker-in-Docker runners because they spin up containers internally.

| CI Job | Image | What it does |
|--------|-------|--------------|
| `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 |
| `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 |
| `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 |
| `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 |
| `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 |
| `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 |

Runner: `docker-in-docker:amd64`
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}`
Expand Down
2 changes: 1 addition & 1 deletion .claude/ci/system-tests-onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The shared template expands each scenario group into jobs that:
| `docker-ssi` | Docker-based SSI (no VM, uses Docker-in-Docker) |

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

### CI secrets

Expand Down
8 changes: 4 additions & 4 deletions .gitlab/ci-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CentOS:
needs: []
tags: ["arch:amd64"]
timeout: 4h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
parallel:
matrix:
- PHP_VERSION:
Expand Down Expand Up @@ -45,7 +45,7 @@ Alpine:
needs: []
tags: ["arch:amd64"]
timeout: 4h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
parallel:
matrix:
- PHP_VERSION:
Expand Down Expand Up @@ -74,7 +74,7 @@ Bookworm:
needs: []
tags: ["arch:amd64"]
timeout: 4h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
parallel:
matrix:
- PHP_VERSION:
Expand Down Expand Up @@ -105,7 +105,7 @@ Buster:
needs: []
tags: ["arch:amd64"]
timeout: 4h
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
parallel:
matrix:
- PHP_VERSION:
Expand Down
10 changes: 5 additions & 5 deletions .gitlab/generate-appsec.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

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

.appsec_integration_tests:
stage: test
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?
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble # TODO: use a proper docker image with java pre-installed?
tags: [ "docker-in-docker:amd64" ]
variables:
KUBERNETES_CPU_REQUEST: 8
Expand Down Expand Up @@ -194,7 +194,7 @@

"helper-rust build and test":
stage: test
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
tags: [ "docker-in-docker:amd64" ]
interruptible: true
rules:
Expand Down Expand Up @@ -229,7 +229,7 @@

"helper-rust code coverage":
stage: test
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
tags: [ "docker-in-docker:amd64" ]
interruptible: true
rules:
Expand Down Expand Up @@ -295,7 +295,7 @@

"helper-rust integration coverage":
stage: test
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
tags: [ "docker-in-docker:amd64" ]
interruptible: true
rules:
Expand Down
6 changes: 3 additions & 3 deletions .gitlab/generate-package.php
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@

.randomized_tests:
stage: verify
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
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
variables:
KUBERNETES_CPU_REQUEST: 7
KUBERNETES_MEMORY_REQUEST: 30Gi
Expand Down Expand Up @@ -861,7 +861,7 @@

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

"framework test":
stage: verify
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:24.0.4-gbi-focal
image: 486234852809.dkr.ecr.us-east-1.amazonaws.com/docker:29.4.0-noble
tags: [ "docker-in-docker:amd64" ]
variables:
KUBERNETES_CPU_REQUEST: 2
Expand Down
Loading