Skip to content

Commit 68c282a

Browse files
ci: use CI Identities for Windows internal-registry push; keep consuming from mirror
The Windows shell runners have no working registry.ddbuild.io creds (host docker config only has the ECR cred helper, which fails with NoCredentialProviders). Drop the dead-end AWS_REGION workaround and add the CI Identities id_tokens to the Windows build jobs, the supported auth for non-K8s runners (onboarding pending, #ci-identities). The assume-role + docker-config script wiring is deferred until it can be verified post-onboarding. Windows jobs are all manual, so they don't block the pipeline. Until internal Windows images exist, revert the tracer/package generators to consume Windows images from the Docker Hub mirror (ce65269 state) to avoid 404s.
1 parent 0fb5a10 commit 68c282a

3 files changed

Lines changed: 6 additions & 9 deletions

File tree

.gitlab/generate-ci-images.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,17 +143,14 @@ function parse_compose(string $path, array $env): array
143143
- when: manual
144144
allow_failure: true
145145
needs: []
146-
tags: ["windows-v2:2019"]
147146
timeout: 6h
147+
tags: ["windows-v2:2019"]
148+
id_tokens:
149+
CI_IDENTITIES_GITLAB_ID_TOKEN:
150+
aud: ci-identities
148151
variables:
149152
DDCI_CONFIGURE_OTEL_EXPORTER: "true"
150153
GIT_STRATEGY: none
151-
# The host docker config uses the ecr-login credsStore; its `list` errors
152-
# with MissingRegion (e.g. on the anonymous mcr.microsoft.com base pull).
153-
# Give the helper a region so it stops failing; leaves the rest of the
154-
# host config (and its ambient registry.ddbuild.io auth) untouched.
155-
AWS_REGION: "us-east-1"
156-
AWS_DEFAULT_REGION: "us-east-1"
157154
script: |
158155
# Kill leftover containers; a previous run may still hold php_ddtrace.dll open.
159156
$containers = docker ps -aq 2>$null

.gitlab/generate-package.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
$windows_build_platforms = [
6464
[
6565
"triplet" => "x86_64-pc-windows-msvc",
66-
"image_template" => "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-%s_windows",
66+
"image_template" => "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-%s_windows",
6767
"arch" => "amd64",
6868
"host_os" => "windows-msvc",
6969
"targets" => [

.gitlab/generate-tracer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function before_script_steps($with_docker_auth = false) {
119119
variables:
120120
CONTAINER_NAME: $CI_JOB_NAME_SLUG
121121
GIT_STRATEGY: none
122-
IMAGE: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"
122+
IMAGE: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci:php-${PHP_MAJOR_MINOR}_windows"
123123
script: |
124124
<?php windows_git_setup() ?>
125125

0 commit comments

Comments
 (0)