From d6a6e0f5a7ef2c9da166e48307357ff2e92ff14f Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 10:42:06 +0200 Subject: [PATCH 1/6] fix: bump `datadog-agent-buildimages` to ` v29037187-880822bc` --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b4c71ae..9eb3ecf2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,8 @@ stages: variables: AWS_MAX_ATTEMPTS: 5 # retry AWS operations 5 times if they fail on network errors - CI_IMAGE_AGENT_DEPLOY: v47979770-a5a4cfd0 - CI_IMAGE_DEB_X64: v47979770-a5a4cfd0 + CI_IMAGE_AGENT_DEPLOY: v29037187-880822bc + CI_IMAGE_DEB_X64: v29037187-880822bc S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256 TEST_INFRA_DEFINITIONS_BUILDIMAGES: 3b64b3917189 DEFAULT_MAJOR_VERSION: 7 @@ -548,4 +548,4 @@ system_tests: include: - artifact: system_tests_pipeline.yml job: configure_system_tests - strategy: depend \ No newline at end of file + strategy: depend From a625528daa02a41074eb57cd13a023b9514d01d2 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 10:45:55 +0200 Subject: [PATCH 2/6] fix: also bump `test-infra-definitions/runner` --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9eb3ecf2..c8aa4d33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: CI_IMAGE_AGENT_DEPLOY: v29037187-880822bc CI_IMAGE_DEB_X64: v29037187-880822bc S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256 - TEST_INFRA_DEFINITIONS_BUILDIMAGES: 3b64b3917189 + TEST_INFRA_DEFINITIONS_BUILDIMAGES: c7949bda0498 # Taken from ops-specific branch https://github.com/DataDog/test-infra-definitions/pull/1856 DEFAULT_MAJOR_VERSION: 7 TESTING_DIR: ${CI_PROJECT_DIR} DD_INSTALL_ONLY: "true" From 66a2a28aff810f1612423e9c9ed48704fc55118e Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 10:50:27 +0200 Subject: [PATCH 3/6] fix: replace `deb-x64` with `linux` We don't actually publish the `deb-x64` images anymore, it has been merged into `linux` --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8aa4d33..08c30cdf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ stages: variables: AWS_MAX_ATTEMPTS: 5 # retry AWS operations 5 times if they fail on network errors CI_IMAGE_AGENT_DEPLOY: v29037187-880822bc - CI_IMAGE_DEB_X64: v29037187-880822bc + CI_IMAGE_LINUX: v29037187-880822bc S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256 TEST_INFRA_DEFINITIONS_BUILDIMAGES: c7949bda0498 # Taken from ops-specific branch https://github.com/DataDog/test-infra-definitions/pull/1856 DEFAULT_MAJOR_VERSION: 7 @@ -42,7 +42,7 @@ default: - '[ ! -z "$TEST_PIPELINE_ID" ] && export TESTING_APT_REPO_VERSION="stable-x86_64 ${MAJOR_VERSION}"' generate-scripts: - image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64:$CI_IMAGE_DEB_X64 + image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux:$CI_IMAGE_LINUX tags: [arch:amd64] stage: generate script: @@ -61,7 +61,7 @@ generate-scripts: # Common fetching step to avoid having every e2e test job re-fetch everything over the net go_e2e_deps: stage: deps_fetch - image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64:$CI_IMAGE_DEB_X64 + image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux:$CI_IMAGE_LINUX tags: ["arch:amd64"] variables: KUBERNETES_CPU_REQUEST: 16 From 6e23b086ad608b94e800a796e397276538efd185 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 10:54:06 +0200 Subject: [PATCH 4/6] fix: use the right pipeline ID --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08c30cdf..24ffaa25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,8 @@ stages: variables: AWS_MAX_ATTEMPTS: 5 # retry AWS operations 5 times if they fail on network errors - CI_IMAGE_AGENT_DEPLOY: v29037187-880822bc - CI_IMAGE_LINUX: v29037187-880822bc + CI_IMAGE_AGENT_DEPLOY: v128862929-880822bc + CI_IMAGE_LINUX: v128862929-880822bc S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256 TEST_INFRA_DEFINITIONS_BUILDIMAGES: c7949bda0498 # Taken from ops-specific branch https://github.com/DataDog/test-infra-definitions/pull/1856 DEFAULT_MAJOR_VERSION: 7 From 2c30babf2892c9dd964bed4383b6956f7e841837 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 11:23:33 +0200 Subject: [PATCH 5/6] fix: replace `test-infra-definitions/runner` with `linux` We also merged that old image into `linux` --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 24ffaa25..df67fbe0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,6 @@ variables: CI_IMAGE_AGENT_DEPLOY: v128862929-880822bc CI_IMAGE_LINUX: v128862929-880822bc S3_CP_CMD: aws s3 cp --only-show-errors --region us-east-1 --sse AES256 - TEST_INFRA_DEFINITIONS_BUILDIMAGES: c7949bda0498 # Taken from ops-specific branch https://github.com/DataDog/test-infra-definitions/pull/1856 DEFAULT_MAJOR_VERSION: 7 TESTING_DIR: ${CI_PROJECT_DIR} DD_INSTALL_ONLY: "true" @@ -313,7 +312,7 @@ test-vector: e2e: stage: e2e - image: registry.ddbuild.io/ci/test-infra-definitions/runner:$TEST_INFRA_DEFINITIONS_BUILDIMAGES + image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux:$CI_IMAGE_LINUX tags: ["arch:amd64"] dependencies: - generate-scripts From d6ff5ab3231c2ed049766ef18077f97c400aaeb9 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Veyrenc Date: Wed, 5 Aug 2026 12:09:56 +0200 Subject: [PATCH 6/6] fix: install `gotestsum` It's not actually installed in the image because `datadog-agent` grabs it as a standard go dep --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index df67fbe0..5e271912 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -317,6 +317,10 @@ e2e: dependencies: - generate-scripts - go_e2e_deps + variables: + GOPROXY: "https://depot-read-api-go.rapid-dependency-management-depot.all-clusters.local-dc.fabric.dog:8443/magicmirror/magicmirror/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/magicmirror/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/testing/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/magicmirror/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/testing/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/magicmirror/@current/|https://depot-read-api-go.us1.ddbuild.io/magicmirror/testing/@current/|direct" + GONOSUMDB: "github.com/DataDog,go.ddbuild.io" + GOPRIVATE: "" before_script: # Default before_script - '[ -z "$MAJOR_VERSION" ] && export MAJOR_VERSION=${DEFAULT_MAJOR_VERSION}' @@ -336,6 +340,7 @@ e2e: # Retrieve common go deps - mkdir -p $GOPATH/pkg/mod && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod && rm -f modcache_e2e.tar.xz script: + - go install gotest.tools/gotestsum@latest - cd test/e2e && gotestsum --format standard-verbose --junitfile "junit-${CI_JOB_ID}.xml" -- -timeout 0s . -v --flavor ${FLAVOR} --platform ${PLATFORM} --scriptPath ${SCRIPT_PATH} ${EXTRA_PARAMS} after_script: - set +x