Skip to content
Draft
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitlab/generate-ci-images.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ function parse_compose(string $path, array $env): array
Write-Host "Downloading docker-compose..."
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$dockerCompose = "$PWD\docker-compose.exe"
Start-BitsTransfer -Source "$env:GITHUB_RELEASES_MIRROR/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe" -Destination $dockerCompose
# Start-BitsTransfer gets HTTP 405 from the releases mirror; a plain GET works (as curl does on Linux).
curl.exe -L --fail -o $dockerCompose "$env:GITHUB_RELEASES_MIRROR/docker/compose/releases/download/v2.36.0/docker-compose-windows-x86_64.exe"
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

# Scope Docker auth to this job: CI Identities for registry.ddbuild.io only,
# no ECR catch-all that would fail without AWS_DEFAULT_REGION. Docker calls
Expand Down
15 changes: 11 additions & 4 deletions .gitlab/generate-common.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,10 @@ function windows_git_setup_with_packages() {
?>

.services:
test-agent:
name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.22.1
test-agent: &test_agent_service
name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.67.0
alias: test-agent
variables:
variables: &test_agent_variables
LOG_LEVEL: DEBUG
TRACE_LANGUAGE: php
DD_TRACE_AGENT_URL: http://request-replayer:80
Expand All @@ -236,8 +236,15 @@ function windows_git_setup_with_packages() {
KUBERNETES_SERVICE_MEMORY_REQUEST: 1Gi
KUBERNETES_SERVICE_MEMORY_LIMIT: 1Gi

# For jobs without a request-replayer: the test agent forwards /info to DD_TRACE_AGENT_URL and fails it if that host is missing.
test-agent-standalone:
<<: *test_agent_service
variables:
<<: *test_agent_variables
DD_TRACE_AGENT_URL: ""

request-replayer:
name: registry.ddbuild.io/ci/dd-trace-php/request-replayer:4.0
name: registry.ddbuild.io/ci/dd-trace-php/request-replayer:5.0
alias: request-replayer
command: ["php", "-S", "<?= $service_bind_address ?>:80", "index.php"]
variables:
Expand Down
3 changes: 3 additions & 0 deletions .gitlab/generate-package.php
Original file line number Diff line number Diff line change
Expand Up @@ -1699,6 +1699,8 @@ function package_extension_jobs(array $platform, string $kind = "all"): array
PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip
APT_CACHE: $CI_PROJECT_DIR/.cache/apt
DOCKER_DEFAULT_PLATFORM: linux/amd64
# TODO: point back at "main" once DataDog/system-tests#7843 (leiyks/php-v1-payload) is merged.
SYSTEM_TESTS_REF: "leiyks/php-v1-payload"
# TODO DD_API_KEY; SYSTEM_TESTS_AWS_ACCESS_KEY_ID; SYSTEM_TESTS_AWS_SECRET_ACCESS_KEY
needs:
- job: "package extension (bundles): [amd64, x86_64-unknown-linux-gnu]"
Expand Down Expand Up @@ -1758,6 +1760,7 @@ function package_extension_jobs(array $platform, string $kind = "all"): array
parallel:
matrix:
- TESTSUITE:
- APM_TRACING_EFFICIENT_PAYLOAD
- APPSEC_API_SECURITY
- APPSEC_API_SECURITY_RC
- APPSEC_API_SECURITY_NO_RESPONSE_BODY
Expand Down
8 changes: 5 additions & 3 deletions .gitlab/generate-tracer.php
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,11 @@ function windows_test_c_job($job_name, $thread_safety, $targets) {

# Start the container network and services
docker network create -d "nat" -o com.docker.network.windowsshim.dnsservers="1.1.1.1" net
# Force a pull so a runner with a stale cached digest doesn't skip the rebuilt image.
docker pull registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:httpbin-windows
docker run --network net -d --name httpbin-integration registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:httpbin-windows
docker run --network net -d --name request-replayer registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-request-replayer-3.0_windows
docker pull registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-request-replayer-5.0_windows
docker run --network net -d --name request-replayer registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-request-replayer-5.0_windows
docker run --env GITLAB_CI=$env:GITLAB_CI -v ${pwd}:C:\Users\ContainerAdministrator\app --network net -d --name ${CONTAINER_NAME} ${IMAGE} ping -t localhost

# Enable NTFS long path support so cargo's libgit2-based git checkouts of
Expand Down Expand Up @@ -665,7 +668,7 @@ function windows_test_c_job($job_name, $thread_safety, $targets) {
"PHP Language Tests: [<?= $major_minor ?>]":
extends: .debug_test
services:
- !reference [.services, test-agent]
- !reference [.services, test-agent-standalone]
needs:
- job: "compile extension: debug"
parallel:
Expand All @@ -678,7 +681,6 @@ function windows_test_c_job($job_name, $thread_safety, $targets) {
ARCH: "amd64"
DD_TRACE_STARTUP_LOGS: "0"
DD_TRACE_WARN_CALL_STACK_DEPTH: "0"
DD_TRACE_WARN_LEGACY_DD_TRACE: "0"
DD_TRACE_GIT_METADATA_ENABLED: "0"
REPORT_EXIT_STATUS: "1"
TEST_PHP_JUNIT: "${CI_PROJECT_DIR}/artifacts/tests/php-tests.xml"
Expand Down
Loading
Loading