Skip to content

[BARX-1043] Update dca images publish jobs to use tag method for mutable tags instead of full index push #37852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2025

Conversation

kacper-murzyn
Copy link
Contributor

@kacper-murzyn kacper-murzyn commented Jun 11, 2025

What does this PR do?

This PR updates the jobs which publish mutable image tags for cws-instrumentation images to use new approach which does not push full new index, but instead creates a tag that points to the existing reference.

Motivation

Unify the images publish mechanism.

Describe how you validated your changes

To be properly tested with the 7.68.0 RC build.

Instruction (7.68.0-rc.1 example):

  1. Trigger (or let release coordinator) build for 7.68.0-rc.1,
  2. Check jobs in deploy_dca stage - they should all pass,
  3. Verify that the rc tag published points to the 7.68.0-rc.1 tag in public repos, for example in dockerhub

@kacper-murzyn kacper-murzyn requested review from a team as code owners June 11, 2025 12:14
@kacper-murzyn kacper-murzyn added changelog/no-changelog team/agent-delivery qa/rc-required Only for a PR that requires validation on the Release Candidate labels Jun 11, 2025
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Jun 11, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Jun 11, 2025

Gitlab CI Configuration Changes

Modified Jobs

deploy_containers-dca-fips-latest
  deploy_containers-dca-fips-latest:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-fips-amd64,${IMG_BASE_SRC}-fips-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips"
?                ^ ^^^ ^^^^^^ -                                           -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca-fips
-     job: docker_build_cluster_agent_fips_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_fips_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta"
      when: never
    - allow_failure: true
      if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      variables:
        AGENT_REPOSITORY: agent-dev
        DSD_REPOSITORY: dogstatsd-dev
        IMG_REGISTRIES: dev
        OTEL_AGENT_REPOSITORY: ddot-collector-dev
      when: manual
    - allow_failure: true
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: manual
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: latest-fips
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: latest
deploy_containers-dca-fips-rc
  deploy_containers-dca-fips-rc:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-fips-amd64,${IMG_BASE_SRC}-fips-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips"
?                ^ ^^^ ^^^^^^ -                                           -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca-fips
-     job: docker_build_cluster_agent_fips_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_fips_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: rc-fips
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: rc
deploy_containers-dca-fips_internal-latest
  deploy_containers-dca-fips_internal-latest:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-fips-amd64,${IMG_BASE_SRC}-fips-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips"
?                ^ ^^^ ^^^^^^ -                                           -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca-fips_internal
-     job: docker_build_cluster_agent_fips_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_fips_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: manual
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: latest-fips
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: latest
deploy_containers-dca-fips_internal-rc
  deploy_containers-dca-fips_internal-rc:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-fips-amd64,${IMG_BASE_SRC}-fips-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips"
?                ^ ^^^ ^^^^^^ -                                           -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca-fips_internal
-     job: docker_build_cluster_agent_fips_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_fips_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: on_success
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: rc-fips
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: rc
deploy_containers-dca-latest
  deploy_containers-dca-latest:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-amd64,${IMG_BASE_SRC}-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}"
?                ^ ^^^ ^^^^^^ -                                      -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca
-     job: docker_build_cluster_agent_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta"
      when: never
    - allow_failure: true
      if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      variables:
        AGENT_REPOSITORY: agent-dev
        DSD_REPOSITORY: dogstatsd-dev
        IMG_REGISTRIES: dev
        OTEL_AGENT_REPOSITORY: ddot-collector-dev
      when: manual
    - allow_failure: true
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: manual
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: latest
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: latest
deploy_containers-dca-rc
  deploy_containers-dca-rc:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-amd64,${IMG_BASE_SRC}-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}"
?                ^ ^^^ ^^^^^^ -                                      -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca
-     job: docker_build_cluster_agent_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: rc
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: rc
deploy_containers-dca_internal-latest
  deploy_containers-dca_internal-latest:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-amd64,${IMG_BASE_SRC}-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}"
?                ^ ^^^ ^^^^^^ -                                      -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca_internal
-     job: docker_build_cluster_agent_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: manual
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: latest
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: latest
deploy_containers-dca_internal-rc
  deploy_containers-dca_internal-rc:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
-     || exit $?; fi
?               ----
+     || exit $?
-   - if [[ "$CLUSTER_AGENT_REPOSITORY" == "" ]]; then export CLUSTER_AGENT_REPOSITORY="cluster-agent";
-     fi
-   - export IMG_BASE_SRC="${SRC_DCA}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
-   - export IMG_SOURCES="${IMG_BASE_SRC}-amd64,${IMG_BASE_SRC}-arm64"
-   - export IMG_DESTINATIONS="${CLUSTER_AGENT_REPOSITORY}:${VERSION}"
?                ^ ^^^ ^^^^^^ -                                      -
+   - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}
?                ^^^^^ ^^^^ ^^
+   dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    needs:
    - artifacts: false
+     job: deploy_containers-dca_internal
-     job: docker_build_cluster_agent_amd64
-   - artifacts: false
-     job: docker_build_cluster_agent_arm64
    rules:
    - if: $DEPLOY_AGENT != "true" && $DDR_WORKFLOW_ID == null
      when: never
    - if: ($DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null) && $BUCKET_BRANCH ==
        "beta" && $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: on_success
    script:
    - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
      || exit $?; export GITLAB_TOKEN
    - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
      \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
      \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
      -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
      fi\n"
    - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
      main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
      IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
      IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
      DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: deploy_dca
    tags:
    - arch:amd64
    variables:
+     IMG_NEW_TAGS: rc
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
      SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
      SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
      SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
      SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
-     VERSION: rc

Added Jobs

.deploy_mutable_dca_tags-base
.deploy_mutable_dca_tags-base:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}
  dependencies: []
  image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
  script:
  - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
    || exit $?; export GITLAB_TOKEN
  - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
    \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
    \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
    \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
    -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
    fi\n"
  - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
    main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
    IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
    IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
    DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
  stage: deploy_dca
  tags:
  - arch:amd64
  variables:
    IMG_SIGNING: ''
    IMG_VARIABLES: ''
    SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
    SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
    SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
    SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
    SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent
.deploy_mutable_dca_tags-fips-base
.deploy_mutable_dca_tags-fips-base:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${CLUSTER_AGENT_REPOSITORY}:${VERSION}-fips
  dependencies: []
  image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
  script:
  - GITLAB_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $GITLAB_TOKEN write_api)
    || exit $?; export GITLAB_TOKEN
  - "if [[ \"$BUCKET_BRANCH\" == \"nightly\" && ( \"$IMG_SOURCES\" =~ \"$SRC_AGENT\"\
    \ || \"$IMG_SOURCES\" =~ \"$SRC_DCA\" || \"$IMG_SOURCES\" =~ \"$SRC_CWS_INSTRUMENTATION\"\
    \ || \"$IMG_VARIABLES\" =~ \"$SRC_AGENT\" || \"$IMG_VARIABLES\" =~ \"$SRC_DCA\"\
    \ || \"$IMG_VARIABLES\" =~ \"$SRC_CWS_INSTRUMENTATION\" ) ]]; then\n  export ECR_RELEASE_SUFFIX=\"\
    -nightly\"\nelse\n  export ECR_RELEASE_SUFFIX=\"${CI_COMMIT_TAG+-release}\"\n\
    fi\n"
  - IMG_VARIABLES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_OTEL_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - dda inv pipeline.trigger-child-pipeline --project-name DataDog/public-images --git-ref
    main --timeout 1800 --variable IMG_VARIABLES --variable IMG_REGISTRIES --variable
    IMG_SOURCES --variable IMG_DESTINATIONS --variable IMG_TAG_REFERENCE --variable
    IMG_NEW_TAGS --variable IMG_SIGNING --variable APPS --variable BAZEL_TARGET --variable
    DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
  stage: deploy_dca
  tags:
  - arch:amd64
  variables:
    IMG_SIGNING: ''
    IMG_VARIABLES: ''
    SRC_AGENT: registry.ddbuild.io/ci/datadog-agent/agent
    SRC_CWS_INSTRUMENTATION: registry.ddbuild.io/ci/datadog-agent/cws-instrumentation
    SRC_DCA: registry.ddbuild.io/ci/datadog-agent/cluster-agent
    SRC_DSD: registry.ddbuild.io/ci/datadog-agent/dogstatsd
    SRC_OTEL_AGENT: registry.ddbuild.io/ci/datadog-agent/otel-agent

Changes Summary

Removed Modified Added Renamed
0 8 2 0

ℹ️ Diff available in the job log.

deploy_containers-dca:
extends: .deploy_containers-dca-base
rules: !reference [.on_deploy_manual_auto_on_rc]

deploy_containers-dca-rc:
extends: .deploy_containers-dca-base
extends: .deploy_mutable_dca_tags-base
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
extends: .deploy_mutable_dca_tags-base
extends: .deploy_mutable_dca_tags-base

nit, someone will drop them in a follow up PR, adding extra noise to their PR

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: d792a855-5456-4c6d-8832-6619eebbbb6d

Baseline: 4530098
Comparison: bf5c9b6
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +3.02 [+0.24, +5.80] 1 Logs bounds checks dashboard
file_tree memory utilization +2.49 [+2.28, +2.69] 1 Logs
tcp_syslog_to_blackhole ingress throughput +1.08 [+1.02, +1.15] 1 Logs
ddot_logs memory utilization +0.62 [+0.48, +0.76] 1 Logs
otlp_ingest_logs memory utilization +0.37 [+0.24, +0.49] 1 Logs
ddot_metrics memory utilization +0.21 [+0.09, +0.33] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.19 [+0.12, +0.26] 1 Logs
quality_gate_idle_all_features memory utilization +0.14 [+0.06, +0.22] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.09 [-0.54, +0.72] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.06 [-0.51, +0.63] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.02 [-0.21, +0.25] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.02 [-0.56, +0.59] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.28, +0.28] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.03 [-0.63, +0.57] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.04 [-0.64, +0.57] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.05 [-0.64, +0.54] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.08 [-0.68, +0.52] 1 Logs
otlp_ingest_metrics memory utilization -0.12 [-0.28, +0.05] 1 Logs
quality_gate_idle memory utilization -0.24 [-0.30, -0.18] 1 Logs bounds checks dashboard
docker_containers_cpu % cpu utilization -0.32 [-3.29, +2.65] 1 Logs
docker_containers_memory memory utilization -0.93 [-1.01, -0.85] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -1.54 [-2.39, -0.69] 1 Logs

Bounds Checks: ✅ Passed

perf experiment bounds_check_name replicates_passed links
docker_containers_cpu simple_check_run 10/10
docker_containers_memory memory_usage 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@kacper-murzyn
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Jun 11, 2025

View all feedbacks in Devflow UI.

2025-06-11 13:38:15 UTC ℹ️ Start processing command /merge


2025-06-11 13:38:28 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2025-06-11 14:36:10 UTC ℹ️ MergeQueue: merge request added to the queue

The expected merge time in main is approximately 50m (p90).


2025-06-11 15:55:19 UTC ℹ️ MergeQueue: This merge request was merged

@agent-platform-auto-pr
Copy link
Contributor

Static quality checks

✅ Please find below the results from static quality gates
Comparison made with ancestor 4530098

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${0}$$ $${695.7}$$ < $${752.99}$$ $${+0.01}$$ $${175.93}$$ < $${187.44}$$
agent_deb_amd64_fips $${0}$$ $${693.91}$$ < $${751.36}$$ $${-0.02}$$ $${175.56}$$ < $${187.06}$$
agent_heroku_amd64 $${0}$$ $${358.2}$$ < $${369.68}$$ $${-0}$$ $${96.43}$$ < $${99.55}$$
agent_msi $${0}$$ $${957.71}$$ < $${987.01}$$ $${+0.02}$$ $${146.13}$$ < $${150.72}$$
agent_rpm_amd64 $${0}$$ $${695.69}$$ < $${752.98}$$ $${+0.01}$$ $${177.48}$$ < $${190.03}$$
agent_rpm_amd64_fips $${0}$$ $${693.9}$$ < $${751.35}$$ $${+0.01}$$ $${177.34}$$ < $${189.81}$$
agent_rpm_arm64 $${0}$$ $${685.69}$$ < $${739.42}$$ $${-0}$$ $${160.87}$$ < $${171.23}$$
agent_rpm_arm64_fips $${0}$$ $${684.04}$$ < $${737.91}$$ $${-0.02}$$ $${160.0}$$ < $${170.22}$$
agent_suse_amd64 $${0}$$ $${695.69}$$ < $${752.98}$$ $${+0.01}$$ $${177.48}$$ < $${190.03}$$
agent_suse_amd64_fips $${0}$$ $${693.9}$$ < $${751.35}$$ $${+0.01}$$ $${177.34}$$ < $${189.81}$$
agent_suse_arm64 $${0}$$ $${685.69}$$ < $${739.42}$$ $${-0}$$ $${160.87}$$ < $${171.23}$$
agent_suse_arm64_fips $${0}$$ $${684.04}$$ < $${737.91}$$ $${-0.02}$$ $${160.0}$$ < $${170.22}$$
docker_agent_amd64 $${+0}$$ $${779.49}$$ < $${849.39}$$ $${-0}$$ $${268.44}$$ < $${288.34}$$
docker_agent_arm64 $${-0}$$ $${792.94}$$ < $${858.97}$$ $${+0}$$ $${255.84}$$ < $${274.36}$$
docker_agent_jmx_amd64 $${+0}$$ $${970.69}$$ < $${1040.59}$$ $${+0}$$ $${337.4}$$ < $${357.3}$$
docker_agent_jmx_arm64 $${+0}$$ $${972.74}$$ < $${1038.77}$$ $${+0}$$ $${320.78}$$ < $${339.32}$$
docker_agent_windows1809 $${+0}$$ $${1485.81}$$ < $${1557.19}$$ $${+0.05}$$ $${487.69}$$ < $${507.33}$$
docker_agent_windows1809_core $${+0.06}$$ $${6215.76}$$ < $${6287.46}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows1809_core_jmx $${+0}$$ $${6337.34}$$ < $${6409.04}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows1809_jmx $${+0}$$ $${1607.44}$$ < $${1679.14}$$ $${+0.07}$$ $${529.96}$$ < $${550.27}$$
docker_agent_windows2022 $${-0}$$ $${1505.1}$$ < $${1576.85}$$ $${+0.01}$$ $${500.38}$$ < $${520.76}$$
docker_agent_windows2022_core $${-0}$$ $${6188.83}$$ < $${6260.53}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows2022_core_jmx $${+0.26}$$ $${6310.73}$$ < $${6382.17}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows2022_jmx $${+0.19}$$ $${1626.69}$$ < $${1698.2}$$ $${+0.01}$$ $${542.64}$$ < $${562.99}$$
docker_cluster_agent_amd64 $${+0}$$ $${259.21}$$ < $${259.73}$$ $${+0}$$ $${102.9}$$ < $${103.68}$$
docker_cluster_agent_arm64 $${+0}$$ $${273.58}$$ < $${274.24}$$ $${+0}$$ $${97.59}$$ < $${98.45}$$
docker_cws_instrumentation_amd64 $${-0}$$ $${7.08}$$ < $${7.12}$$ $${+0}$$ $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${+0}$$ $${6.69}$$ < $${6.92}$$ $${+0}$$ $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${0}$$ $${39.21}$$ < $${39.57}$$ $${-0}$$ $${15.11}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${+0}$$ $${37.88}$$ < $${38.2}$$ $${+0}$$ $${14.53}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${+0}$$ $${8.0}$$ < $${8.97}$$
dogstatsd_deb_arm64 $${0}$$ $${29.01}$$ < $${30.08}$$ $${+0}$$ $${6.94}$$ < $${7.92}$$
dogstatsd_rpm_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${-0}$$ $${8.0}$$ < $${8.98}$$
dogstatsd_suse_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${-0}$$ $${8.0}$$ < $${8.98}$$
iot_agent_deb_amd64 $${0}$$ $${50.31}$$ < $${60.17}$$ $${+0}$$ $${12.8}$$ < $${15.82}$$
iot_agent_deb_arm64 $${0}$$ $${47.78}$$ < $${56.94}$$ $${-0}$$ $${11.11}$$ < $${13.86}$$
iot_agent_deb_armhf $${0}$$ $${47.35}$$ < $${56.41}$$ $${+0}$$ $${11.18}$$ < $${13.86}$$
iot_agent_rpm_amd64 $${0}$$ $${50.31}$$ < $${60.18}$$ $${+0}$$ $${12.82}$$ < $${15.84}$$
iot_agent_rpm_arm64 $${0}$$ $${47.78}$$ < $${56.94}$$ $${-0}$$ $${11.13}$$ < $${13.76}$$
iot_agent_suse_amd64 $${0}$$ $${50.31}$$ < $${60.18}$$ $${+0}$$ $${12.82}$$ < $${15.84}$$

@dd-mergequeue dd-mergequeue bot merged commit 4e1c6c5 into main Jun 11, 2025
274 checks passed
@dd-mergequeue dd-mergequeue bot deleted the kacper-murzyn/barx-1043 branch June 11, 2025 15:55
@github-actions github-actions bot added this to the 7.68.0 milestone Jun 11, 2025
kacper-murzyn added a commit that referenced this pull request Jun 13, 2025
…for mutable tags instead of full index push (#37852)"

This reverts commit 4e1c6c5.
kacper-murzyn added a commit that referenced this pull request Jun 13, 2025
…for mutable tags instead of full index push (#37852)"

This reverts commit 4e1c6c5.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog qa/rc-required Only for a PR that requires validation on the Release Candidate short review PR is simple enough to be reviewed quickly team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants