From 092058f12856b80bd86a739371afa11ac3e21897 Mon Sep 17 00:00:00 2001 From: Toby Lawrence Date: Tue, 28 Jul 2026 14:55:24 -0400 Subject: [PATCH] chore(ci): revert change to use newest tag for CI images --- .gitlab-ci.yml | 11 ++++------- .gitlab/internal.yml | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae574783988..f79506731f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,10 +49,10 @@ variables: # output artifacts like ADP itself. SALUKI_IMAGE_REPO_PREFIX: "saluki" SALUKI_IMAGE_REPO_BASE: "${IMAGE_REGISTRY}/${SALUKI_IMAGE_REPO_PREFIX}" - SALUKI_BUILD_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/build-ci:newest" - SALUKI_GENERAL_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/general-ci:newest" - SALUKI_SMP_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/smp-ci:newest" - SALUKI_BUILDCACHE_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/buildcache-ci:newest" + SALUKI_BUILD_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/build-ci:latest" + SALUKI_GENERAL_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/general-ci:latest" + SALUKI_SMP_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/smp-ci:latest" + SALUKI_BUILDCACHE_CI_IMAGE: "${SALUKI_IMAGE_REPO_BASE}/buildcache-ci:latest" SPDX_LICENSES_IMAGE: "registry.ddbuild.io/images/spdx-license-list-data:3.28.0" # Converged Datadog Agent-specific variables, which control how we build the converged Datadog Agent image that we @@ -93,9 +93,6 @@ variables: default: tags: ["arch:amd64"] - image: - name: "${SALUKI_BUILD_CI_IMAGE}" - pull_policy: always # Run a job on official releases (i.e. tagged). .on_official_release: diff --git a/.gitlab/internal.yml b/.gitlab/internal.yml index dae98c6576e..b2b613d8e95 100644 --- a/.gitlab/internal.yml +++ b/.gitlab/internal.yml @@ -42,7 +42,7 @@ allow_failure: true script: - export IMAGE_REF=${SALUKI_IMAGE_REPO_BASE}/${IMAGE_NAME}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} - - crane tag ${IMAGE_REF} newest + - crane tag ${IMAGE_REF} latest generate-build-ci-image: extends: [.generate-ci-image-definition]