From 99c3e0895ea35c59f84aded11cffd839bbe9ddc2 Mon Sep 17 00:00:00 2001 From: Eric Lim Date: Thu, 12 Nov 2026 14:04:36 +0000 Subject: [PATCH 1/2] ci: use internal Buildx builders for image validation --- .gitlab-ci.yml | 9 ++++++++- .gitlab/input_files/build.yaml.tpl | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index be40584d..a727fd43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: ci image: stage: build - image: registry.ddbuild.io/images/docker:20.10 + image: registry.ddbuild.io/images/docker:v152559392-b10b485-20.10.13-jammy@sha256:28b59a7afd7367c583ed3454e922d6f5463a2e6c22d4c21e30dfd9844dd64f84 tags: ["arch:arm64"] id_tokens: DDSIGN_ID_TOKEN: @@ -55,3 +55,10 @@ build-layers: strategy: depend rules: - when: on_success + +validate-ci-builder: + stage: pre + image: registry.ddbuild.io/images/docker:v152559392-b10b485-20.10.13-jammy@sha256:28b59a7afd7367c583ed3454e922d6f5463a2e6c22d4c21e30dfd9844dd64f84 + tags: ["arch:amd64"] + script: + - docker buildx version | grep -F "github.com/docker/buildx v0.38.2-dd.3 " diff --git a/.gitlab/input_files/build.yaml.tpl b/.gitlab/input_files/build.yaml.tpl index bb105b5c..ea8cc119 100644 --- a/.gitlab/input_files/build.yaml.tpl +++ b/.gitlab/input_files/build.yaml.tpl @@ -142,6 +142,9 @@ publish layer {{ $environment.name }} ({{ $runtime.name }}): tags: ["arch:amd64"] image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION} rules: + # Image maintenance cannot deploy Lambda layers or services. + - if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//' + when: never - if: '"{{ $environment.name }}" == "sandbox" && $REGION == "{{ $e2e_region }}"' when: on_success - if: '"{{ $environment.name }}" =~ /^(sandbox|staging)/' @@ -230,6 +233,11 @@ publish npm package: e2e-test: stage: e2e + rules: + # Image maintenance cannot deploy Lambda layers or services. + - if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//' + when: never + - when: on_success trigger: project: DataDog/serverless-e2e-tests strategy: depend @@ -246,8 +254,21 @@ e2e-test: e2e-test-status: stage: e2e - image: registry.ddbuild.io/images/docker:20.10-py3 + rules: + # Image maintenance cannot deploy Lambda layers or services. + - if: '$CI_COMMIT_BRANCH =~ /^ci-image\// || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^ci-image\//' + when: never + - when: on_success + image: registry.ddbuild.io/images/docker:v152575203-37c9356-20.10-py3-buildx-0382@sha256:f3a52d7dd87121dec7f09f3321e2ddf7c84b127dceaabe645ba612f4f4c81887 tags: ["arch:amd64"] timeout: 3h script: - .gitlab/scripts/poll_e2e.sh + +validate-python-ci-tools: + stage: test + image: registry.ddbuild.io/images/docker:v152575203-37c9356-20.10-py3-buildx-0382@sha256:f3a52d7dd87121dec7f09f3321e2ddf7c84b127dceaabe645ba612f4f4c81887 + tags: ["arch:amd64"] + script: + - python3 --version + - docker buildx version | grep -F "github.com/docker/buildx v0.38.2-dd.3 " From 32eb3833ed99f8211d011040706904717c9375aa Mon Sep 17 00:00:00 2001 From: Eric Lim Date: Fri, 13 Nov 2026 15:46:38 +0000 Subject: [PATCH 2/2] ci: follow maintained shared image tags --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a727fd43..ffa82abb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: ci image: stage: build - image: registry.ddbuild.io/images/docker:v152559392-b10b485-20.10.13-jammy@sha256:28b59a7afd7367c583ed3454e922d6f5463a2e6c22d4c21e30dfd9844dd64f84 + image: registry.ddbuild.io/images/docker:20.10.13-jammy tags: ["arch:arm64"] id_tokens: DDSIGN_ID_TOKEN: @@ -58,7 +58,7 @@ build-layers: validate-ci-builder: stage: pre - image: registry.ddbuild.io/images/docker:v152559392-b10b485-20.10.13-jammy@sha256:28b59a7afd7367c583ed3454e922d6f5463a2e6c22d4c21e30dfd9844dd64f84 + image: registry.ddbuild.io/images/docker:20.10.13-jammy tags: ["arch:amd64"] script: - - docker buildx version | grep -F "github.com/docker/buildx v0.38.2-dd.3 " + - docker buildx version