Skip to content

chore(ci): bump internal agent image to tmpl-v26 (check_intake_queue 1.5.0) - #54923

Open
alyssamui2 wants to merge 1 commit into
mainfrom
alyssamui2/update-to-tmpl-v26
Open

chore(ci): bump internal agent image to tmpl-v26 (check_intake_queue 1.5.0)#54923
alyssamui2 wants to merge 1 commit into
mainfrom
alyssamui2/update-to-tmpl-v26

Conversation

@alyssamui2

@alyssamui2 alyssamui2 commented Aug 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

What does this PR do?

Points the uncompressed -jmx and -fips internal datadog-agent image builds at datadog-agent/tmpl-v26 (was tmpl-v25) in the images repo:

 publish_internal_container_image-jmx / -fips:
   - COMPRESSION: ""
-        IMAGE_VERSION: tmpl-v25
+        IMAGE_VERSION: tmpl-v26

Motivation

tmpl-v26 bumps check_intake_queue 1.3.2 -> 1.5.0 (cell-tagged zero for an empty intake queue; DataDog/integrations-internal#283). The template was added in DataDog/images#11094 rather than editing tmpl-v25 in place (the in-place bump images#11084 was reverted in images#11093).

@alyssamui2 @claude
chore(ci): bump internal agent image to tmpl-v26 (check_intake_queue …
9977be9 
…1.5.0)

Point the uncompressed -jmx and -fips internal datadog-agent image builds at
datadog-agent/tmpl-v26 in the images repo, which bumps check_intake_queue
1.3.2 -> 1.5.0 (cell-tagged zero for empty intake queue,
DataDog/integrations-internal#283). New template added in DataDog/images#11094;
the in-place tmpl-v25 bump (#11084) is reverted in #11093.

CI-config-only change (no user-facing code) -> changelog/no-changelog.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Signed-off-by: Alyssa Mui <alyssa.mui@datadoghq.com>
@alyssamui2 alyssamui2 added qa/no-code-change No code change in Agent code requiring validation changelog/no-changelog No changelog entry needed labels Aug 14, 2026
@alyssamui2 alyssamui2 mentioned this pull request Aug 14, 2026
Closed
@alyssamui2
alyssamui2 marked this pull request as ready for review August 14, 2026 18:26
@alyssamui2
alyssamui2 requested a review from a team as a code owner August 14, 2026 18:26
@dd-octo-sts dd-octo-sts Bot added internal Identify a non-fork PR team/agent-delivery labels Aug 14, 2026
@github-actions github-actions Bot added the short review PR is simple enough to be reviewed quickly label Aug 14, 2026
@sabrina-datadog sabrina-datadog added the backport/7.83.x Automatically create a backport PR to the 7.83.x branch once the PR is merged label Aug 14, 2026
@dd-octo-sts

dd-octo-sts Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Gitlab CI Configuration Changes

Modified Jobs

publish_internal_container_image-fips 
  publish_internal_container_image-fips:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
    needs:
    - artifacts: false
      job: docker_build_fips_agent7_jmx
    - artifacts: false
      job: docker_build_fips_agent7_arm64_jmx
    parallel:
      matrix:
      - COMPRESSION: -nydus
        IMAGE_VERSION: tmpl-v24
        RELEASE_TAG_COMPRESSION_SUFFIX: -zstd-nydus
      - COMPRESSION: ''
-       IMAGE_VERSION: tmpl-v25
?                             ^
+       IMAGE_VERSION: tmpl-v26
?                             ^
        RELEASE_TAG_COMPRESSION_SUFFIX: ''
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
      variables:
        RELEASE_PROD: 'true'
    - changes:
        compare_to: $COMPARE_TO_BRANCH
        paths:
        - .gitlab/deploy/internal_image_deploy/internal_image_deploy.yml
        - Dockerfiles/**/*
      variables:
        RELEASE_PROD: 'false'
    - allow_failure: true
      variables:
        RELEASE_PROD: 'false'
      when: manual
    script:
    - export RELEASE_STAGING=""
    - export DYNAMIC_BUILD_RENDER_RULES="agent-build-only"
    - export IMAGES_GIT_REF="master"
    - export BASE_RELEASE_TAG="${CI_COMMIT_REF_NAME//\//-}"
    - export RELEASE_TAG="${BASE_RELEASE_TAG}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}"
    - export TMPL_SRC_IMAGE="v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TMPL_SRC_IMAGE_SUFFIX}"
    - export IMAGE_VERSION="${IMAGE_VERSION}${COMPRESSION}"
    - export BUILD_TAG="${RELEASE_TAG}"
    - if [ "$BUCKET_BRANCH" = "beta" ] || [ "$BUCKET_BRANCH" = "stable" ]; then TMPL_SRC_REPO="${TMPL_SRC_REPO}-release";
      fi
    - "if [ \"$BUCKET_BRANCH\" = \"nightly\" ]; then\n  RELEASE_TAG=\"${BASE_RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}\"\
      \n  TMPL_SRC_REPO=\"${TMPL_SRC_REPO}-nightly\"\nfi\n"
    - if [ "$BUCKET_BRANCH" = "dev" ]; then RELEASE_TAG="dev-${BASE_RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}";
      fi
    - "# TODO: Remove this workaround once JIT replication is reliable for these\n#\
      \ images.\nif [ -z \"$CI_COMMIT_TAG\" ]; then\n  export RELEASE_STAGING=\"true\"\
      \n  export RELEASE_PROD=\"\"\nfi\n"
    - if [ "${RELEASE_PROD_OVERRIDE:-}" = "true" ]; then export RELEASE_PROD="true";
      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
    stage: internal_image_deploy
    tags:
    - arch:amd64
    - specific:true
    timeout: 1h
    variables:
      IMAGE_NAME: datadog-agent
      RELEASE_TAG_SUFFIX: -fips-jmx
      TMPL_SRC_IMAGE_SUFFIX: -7-fips-jmx
      TMPL_SRC_REPO: ci/datadog-agent/agent
publish_internal_container_image-jmx 
  publish_internal_container_image-jmx:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
    needs:
    - artifacts: false
      job: docker_build_agent7_jmx
    - artifacts: false
      job: docker_build_agent7_jmx_arm64
    parallel:
      matrix:
      - COMPRESSION: -nydus
        IMAGE_VERSION: tmpl-v24
        RELEASE_TAG_COMPRESSION_SUFFIX: -zstd-nydus
      - COMPRESSION: ''
-       IMAGE_VERSION: tmpl-v25
?                             ^
+       IMAGE_VERSION: tmpl-v26
?                             ^
        RELEASE_TAG_COMPRESSION_SUFFIX: ''
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
      variables:
        RELEASE_PROD: 'true'
    - changes:
        compare_to: $COMPARE_TO_BRANCH
        paths:
        - .gitlab/deploy/internal_image_deploy/internal_image_deploy.yml
        - Dockerfiles/**/*
      variables:
        RELEASE_PROD: 'false'
    - allow_failure: true
      variables:
        RELEASE_PROD: 'false'
      when: manual
    script:
    - export RELEASE_STAGING=""
    - export DYNAMIC_BUILD_RENDER_RULES="agent-build-only"
    - export IMAGES_GIT_REF="master"
    - export BASE_RELEASE_TAG="${CI_COMMIT_REF_NAME//\//-}"
    - export RELEASE_TAG="${BASE_RELEASE_TAG}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}"
    - export TMPL_SRC_IMAGE="v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TMPL_SRC_IMAGE_SUFFIX}"
    - export IMAGE_VERSION="${IMAGE_VERSION}${COMPRESSION}"
    - export BUILD_TAG="${RELEASE_TAG}"
    - if [ "$BUCKET_BRANCH" = "beta" ] || [ "$BUCKET_BRANCH" = "stable" ]; then TMPL_SRC_REPO="${TMPL_SRC_REPO}-release";
      fi
    - "if [ \"$BUCKET_BRANCH\" = \"nightly\" ]; then\n  RELEASE_TAG=\"${BASE_RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}\"\
      \n  TMPL_SRC_REPO=\"${TMPL_SRC_REPO}-nightly\"\nfi\n"
    - if [ "$BUCKET_BRANCH" = "dev" ]; then RELEASE_TAG="dev-${BASE_RELEASE_TAG}-${CI_COMMIT_SHORT_SHA}${RELEASE_TAG_SUFFIX}${RELEASE_TAG_COMPRESSION_SUFFIX}";
      fi
    - "# TODO: Remove this workaround once JIT replication is reliable for these\n#\
      \ images.\nif [ -z \"$CI_COMMIT_TAG\" ]; then\n  export RELEASE_STAGING=\"true\"\
      \n  export RELEASE_PROD=\"\"\nfi\n"
    - if [ "${RELEASE_PROD_OVERRIDE:-}" = "true" ]; then export RELEASE_PROD="true";
      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
    stage: internal_image_deploy
    tags:
    - arch:amd64
    - specific:true
    timeout: 1h
    variables:
      IMAGE_NAME: datadog-agent
      RELEASE_TAG_SUFFIX: -jmx
      TMPL_ADP_VERSION: 0.1.7
      TMPL_SRC_IMAGE_SUFFIX: -7-jmx
      TMPL_SRC_REPO: ci/datadog-agent/agent

Changes Summary

Removed Modified Added Renamed
0 2 0 0

ℹ️ Diff available in the job log.

@dd-octo-sts

dd-octo-sts Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Files inventory check summary

File checks results against ancestor 56a2203e:

Results for datadog-agent_7.84.0~devel.git.175.9977be9.pipeline.131077171-1_amd64.deb:

No change detected

Results for datadog-iot-agent_7.84.0~devel.git.175.9977be9.pipeline.131077171-1_amd64.deb:

No change detected

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sabrina-datadog sabrina-datadog sabrina-datadog approved these changes

Assignees

No one assigned

Labels

backport/7.83.x Automatically create a backport PR to the 7.83.x branch once the PR is merged changelog/no-changelog No changelog entry needed internal Identify a non-fork PR qa/no-code-change No code change in Agent code requiring validation short review PR is simple enough to be reviewed quickly team/agent-delivery

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alyssamui2 @sabrina-datadog