Skip to content

Commit 992399d

Browse files
authored
ci: pull php-5.6 loader test image from Docker Hub (#4039)
The php-5.6_buster CI image is no longer published to the internal registry (registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci), so the "Loader test on amd64 libc: [5.6, nts, buster]" job failed with ErrImagePull/NotFound. Keep the job and source only the 5.6 image from Docker Hub via the ddbuild mirror (registry.ddbuild.io/images/mirror/datadog/dd-trace-ci) through a per-matrix LOADER_IMAGE_REPO override. All other PHP versions and the arm64 job continue to use the internal registry. Signed-off-by: Alexandre Rulleau <alexandre.rulleau@datadoghq.com>
1 parent 5cbfcd8 commit 992399d

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.gitlab/generate-package.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1406,12 +1406,13 @@ function appsec_image_from_tag_mapping(string $tag): string
14061406
<?php foreach ($arch_targets as $arch): ?>
14071407
"Loader test on <?= $arch ?> libc":
14081408
stage: verify
1409-
image: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci:php-${MAJOR_MINOR}_${CONTAINER_SUFFIX}"
1409+
image: "${LOADER_IMAGE_REPO}:php-${MAJOR_MINOR}_${CONTAINER_SUFFIX}"
14101410
tags: [ "arch:$ARCH" ]
14111411
variables:
14121412
VALGRIND: false
14131413
ARCH: "<?= $arch ?>"
14141414
CONTAINER_SUFFIX: bookworm-9
1415+
LOADER_IMAGE_REPO: "registry.ddbuild.io/ci/dd-trace-php/dd-trace-ci"
14151416
needs:
14161417
- job: "package loader: [<?= $arch ?>]"
14171418
artifacts: true
@@ -1422,6 +1423,7 @@ function appsec_image_from_tag_mapping(string $tag): string
14221423
- "5.6"
14231424
PHP_FLAVOUR: nts
14241425
CONTAINER_SUFFIX: buster
1426+
LOADER_IMAGE_REPO: "registry.ddbuild.io/images/mirror/datadog/dd-trace-ci"
14251427
- MAJOR_MINOR:
14261428
- "7.0"
14271429
- "7.1"

0 commit comments

Comments
 (0)