From ad56b952b3b21c91ce7bed15b04f1e26c3569349 Mon Sep 17 00:00:00 2001 From: Ali Benabdallah Date: Wed, 6 May 2026 14:06:54 +0200 Subject: [PATCH] Backport image replication target workaround to 7.78.x --- .../internal_image_deploy/internal_image_deploy.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab/deploy/internal_image_deploy/internal_image_deploy.yml b/.gitlab/deploy/internal_image_deploy/internal_image_deploy.yml index 1bd0ff355e9c..f741f8fcb0e4 100644 --- a/.gitlab/deploy/internal_image_deploy/internal_image_deploy.yml +++ b/.gitlab/deploy/internal_image_deploy/internal_image_deploy.yml @@ -17,8 +17,9 @@ RELEASE_TAG_COMPRESSION_SUFFIX: "-zstd-nydus" script: # Constant variables - - export RELEASE_STAGING="true" + - export RELEASE_STAGING="" - export DYNAMIC_BUILD_RENDER_RULES="agent-build-only" + - export IMAGES_GIT_REF="master" # Job specific variables - export BASE_RELEASE_TAG="${CI_COMMIT_REF_NAME//\//-}" - export RELEASE_TAG="${BASE_RELEASE_TAG}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}" @@ -36,7 +37,13 @@ TMPL_SRC_REPO="${TMPL_SRC_REPO}-nightly" fi - if [ "$BUCKET_BRANCH" = "dev" ]; then RELEASE_TAG="dev-${BASE_RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}"; fi - - "dda inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref master --timeout 3600 --variable IMAGE_VERSION --variable IMAGE_NAME --variable RELEASE_TAG --variable TMPL_SRC_IMAGE --variable TMPL_SRC_REPO --variable TMPL_ADP_VERSION --variable RELEASE_STAGING --variable RELEASE_PROD --variable DYNAMIC_BUILD_RENDER_RULES --variable APPS --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS" + - | + # TODO: Remove this workaround once JIT replication is reliable for these images. + if [ -z "$CI_COMMIT_TAG" ]; then + export RELEASE_STAGING="true" + export RELEASE_PROD="" + fi + - "dda inv pipeline.trigger-child-pipeline --project-name DataDog/images --git-ref ${IMAGES_GIT_REF} --timeout 3600 --variable IMAGE_VERSION --variable IMAGE_NAME --variable RELEASE_TAG --variable TMPL_SRC_IMAGE --variable TMPL_SRC_REPO --variable TMPL_ADP_VERSION --variable RELEASE_STAGING --variable RELEASE_PROD --variable DYNAMIC_BUILD_RENDER_RULES --variable APPS --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS" retry: 2 # -- binary specific variables --