Skip to content

Update image publish jobs for mutable tags to new method #37720

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

kacper-murzyn
Copy link
Contributor

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

What does this PR do?

This PR updates the jobs run during the Agent RC build to update mutable tags based on the image indexes published with the immutable tag, instead of pushing whole new index again.

We have a new method in public-images which can just create a tag if we provide IMG_TAG_REFERENCE and IMG_NEW_TAGS

Motivation

Simplify and improve image publish jobs.

Describe how you validated your changes

Changes validated locally, there will be still a need to check in the actual RC build which is not easy to simulate without poisoning the git repo and repositories.

@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 6, 2025
@github-actions github-actions bot added the medium review PR review might take time label Jun 6, 2025
@agent-platform-auto-pr
Copy link
Contributor

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

Gitlab CI Configuration Changes

Modified Jobs

.deploy_containers-a7-base
  .deploy_containers-a7-base:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
?                                                                                --------------
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --url-safe
?                                                        +++
-     $PARENT_PIPELINE_ID)" || exit $?; fi
+     --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
?    ++++++++++++++
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${FLAVOR}-amd64"
    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}";
      elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}";
      else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
    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_containers
    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_containers-a7-base-fips
  .deploy_containers-a7-base-fips:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)-fips" || exit $?; fi
    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-arm64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
    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_containers
    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_containers-a7-full-base
  .deploy_containers-a7-full-base:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)" || exit $?; fi
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7-full-amd64,${IMG_BASE_SRC}-7-full-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7-jmx-win1809-amd64,${IMG_BASE_SRC}-7-jmx-winltsc2022-amd64"
    - export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-full"
    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_containers
    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_containers-a7_external
  .deploy_containers-a7_external:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
?                                                                                --------------
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --url-safe
?                                                        +++
-     $PARENT_PIPELINE_ID)" || exit $?; fi
+     --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
?    ++++++++++++++
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${FLAVOR}-amd64"
    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}";
      elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}";
      else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - FLAVOR:
        - ''
        - -servercore
        - -linux
        JMX:
        - ''
        - -jmx
    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_containers
    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_containers-a7_win_only_external
  .deploy_containers-a7_win_only_external:
    before_script:
    - OS=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 1)
    - LTSC_VERSION=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 2)
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --major-version
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --major-version
?                                                        +++
      7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
    - IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_SOURCES="${IMG_BASE_SRC}-7${JMX}-win${OS}${FLAVOR}-amd64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}-ltsc${LTSC_VERSION}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - FLAVOR:
        - ''
        - -servercore
        JMX:
        - ''
        - -jmx
        OS_LTSC_MAPPING:
        - ltsc2022:2022
        - 1809:2019
    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_containers
    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_containers-a7_win_only_image
  .deploy_containers-a7_win_only_image:
    before_script:
    - OS=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 1)
    - LTSC_VERSION=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 2)
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --major-version
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --major-version
?                                                        +++
      7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
    - IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_SOURCES="${IMG_BASE_SRC}-7${JMX}-win${OS}${FLAVOR}-amd64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}-ltsc${LTSC_VERSION}${JMX}"
    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_containers
    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_image_tags_base
  .deploy_mutable_image_tags_base:
    before_script:
-   - VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
?                       +++
      || exit $?
-   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${IMG_TAG_REFERENCE_SUFFIX}
?                                                              ------------------
+   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
+   - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
    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_mutable_image_tags
    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_containers-a7
  deploy_containers-a7:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
?                                                                                --------------
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --url-safe
?                                                        +++
-     $PARENT_PIPELINE_ID)" || exit $?; fi
+     --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
?    ++++++++++++++
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${FLAVOR}-amd64"
    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}";
      elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}";
      else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - FLAVOR:
        - ''
        - -servercore
        - -linux
        JMX:
        - ''
        - -jmx
    rules:
    - 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
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL !=
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL ==
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      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_containers
    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_containers-a7-fips
  deploy_containers-a7-fips:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)-fips" || exit $?; fi
    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-arm64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - JMX:
        - ''
        - -jmx
    rules:
    - 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
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL !=
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL ==
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      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_containers
    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_containers-a7-fips_internal
  deploy_containers-a7-fips_internal:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)-fips" || exit $?; fi
    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-arm64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - if: $BUCKET_BRANCH == "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_containers
    tags:
    - arch:amd64
    variables:
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      JMX: -jmx
      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_containers-a7-fips_internal-rc
  deploy_containers-a7-fips_internal-rc:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)-fips" || exit $?; fi
    - export IMG_SOURCES="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-amd64,${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-fips${JMX}-arm64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - JMX:
        - ''
        - -jmx
    rules:
    - allow_failure: true
      if: $FORCE_MANUAL == "true" && $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
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: manual
    - if: $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
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_containers
    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
-     VERSION: 7-fips-rc
deploy_containers-a7-full
  deploy_containers-a7-full:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)" || exit $?; fi
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7-full-amd64,${IMG_BASE_SRC}-7-full-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7-jmx-win1809-amd64,${IMG_BASE_SRC}-7-jmx-winltsc2022-amd64"
    - export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-full"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - 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
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL !=
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL ==
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      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_containers
    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_containers-a7-full-internal
  deploy_containers-a7-full-internal:
    before_script:
-   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
+   - if [[ -z "$VERSION" ]]; then VERSION="$(dda inv -- agent.version --url-safe --pipeline-id
?                                                     +++
      $PARENT_PIPELINE_ID)" || exit $?; fi
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7-full-amd64,${IMG_BASE_SRC}-7-full-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7-jmx-win1809-amd64,${IMG_BASE_SRC}-7-jmx-winltsc2022-amd64"
    - export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}-full"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - if: $BUCKET_BRANCH == "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_containers
    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_containers-a7-win-only
  deploy_containers-a7-win-only:
    before_script:
    - OS=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 1)
    - LTSC_VERSION=$(echo $OS_LTSC_MAPPING | cut -d ':' -f 2)
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --major-version
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --major-version
?                                                        +++
      7 --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
    - IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_SOURCES="${IMG_BASE_SRC}-7${JMX}-win${OS}${FLAVOR}-amd64"
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}-ltsc${LTSC_VERSION}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - FLAVOR:
        - ''
        - -servercore
        JMX:
        - ''
        - -jmx
        OS_LTSC_MAPPING:
        - ltsc2022:2022
        - 1809:2019
    rules:
    - 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
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL !=
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL ==
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      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_containers
    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_containers-a7_internal
  deploy_containers-a7_internal:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
?                                                                                --------------
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --url-safe
?                                                        +++
-     $PARENT_PIPELINE_ID)" || exit $?; fi
+     --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
?    ++++++++++++++
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${FLAVOR}-amd64"
    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}";
      elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}";
      else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - if: $BUCKET_BRANCH == "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_containers
    tags:
    - arch:amd64
    variables:
      IMG_SIGNING: ''
      IMG_VARIABLES: ''
      JMX: -jmx
      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_containers-a7_internal-rc
  deploy_containers-a7_internal-rc:
    before_script:
-   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv agent.version --url-safe --pipeline-id
?                                                                                --------------
+   - if [[ "$VERSION" == "" ]]; then VERSION="$(dda inv -- agent.version --url-safe
?                                                        +++
-     $PARENT_PIPELINE_ID)" || exit $?; fi
+     --pipeline-id $PARENT_PIPELINE_ID)" || exit $?; fi
?    ++++++++++++++
    - export IMG_BASE_SRC="${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}"
    - export IMG_LINUX_SOURCES="${IMG_BASE_SRC}-7${JMX}-amd64,${IMG_BASE_SRC}-7${JMX}-arm64"
    - export IMG_WINDOWS_SOURCES="${IMG_BASE_SRC}-7${JMX}-win1809${FLAVOR}-amd64,${IMG_BASE_SRC}-7${JMX}-winltsc2022${FLAVOR}-amd64"
    - if [[ "$FLAVOR" == "-linux" ]]; then export IMG_SOURCES="${IMG_LINUX_SOURCES}";
      elif [[ "$FLAVOR" == "-servercore" ]]; then export IMG_SOURCES="${IMG_WINDOWS_SOURCES}";
      else export IMG_SOURCES="${IMG_LINUX_SOURCES},${IMG_WINDOWS_SOURCES}"; fi
    - export IMG_DESTINATIONS="${AGENT_REPOSITORY}:${VERSION}${FLAVOR}${JMX}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - allow_failure: true
      if: $FORCE_MANUAL == "true" && $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
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-release
        DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
        IMG_REGISTRIES: internal-aws-ddbuild
        OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
      when: manual
    - if: $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
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_containers
    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
-     VERSION: 7-rc
deploy_containers-dogstatsd
  deploy_containers-dogstatsd:
    before_script:
-   - VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
?                       +++
      || exit $?
    - export IMG_SOURCES="${SRC_DSD}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-amd64,${SRC_DSD}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-arm64"
    - export IMG_DESTINATIONS="${DSD_REPOSITORY}:${VERSION}"
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    rules:
    - 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
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL !=
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      when: on_success
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/ && $FORCE_MANUAL ==
        "true"
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
        OTEL_AGENT_REPOSITORY: ddot-collector
      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_containers
    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_image_tags-a7
  deploy_mutable_image_tags-a7:
    before_script:
-   - VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
?                       +++
      || exit $?
-   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${IMG_TAG_REFERENCE_SUFFIX}
?                                                              ------------------
+   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
+   - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
      - IMG_NEW_TAGS:
        - 7,latest
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - ''
      - IMG_NEW_TAGS:
        - 7-jmx,latest-jmx
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -jmx
      - IMG_NEW_TAGS:
        - 7-servercore,latest-servercore
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -servercore
      - IMG_NEW_TAGS:
        - 7-servercore-jmx,latest-servercore-jmx
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -servercore-jmx
      - IMG_NEW_TAGS:
        - 7-ltsc2019,latest-ltsc2019
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -ltsc2019
      - IMG_NEW_TAGS:
        - 7-ltsc2022,latest-ltsc2022
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -ltsc2022
      - IMG_NEW_TAGS:
        - 7-servercore-ltsc2019,latest-servercore-ltsc2019
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -servercore-ltsc2019
      - IMG_NEW_TAGS:
        - 7-servercore-ltsc2022,latest-servercore-ltsc2022
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -servercore-ltsc2022
      - IMG_NEW_TAGS:
        - 7-servercore-ltsc2019-jmx,latest-servercore-ltsc2019-jmx
-       IMG_TAG_REFERENCE_SUFFIX: -servercore-ltsc2019-jmx
?       ------------------
+       SUFFIX: -servercore-ltsc2019-jmx
      - IMG_NEW_TAGS:
        - 7-servercore-ltsc2022-jmx,latest-servercore-ltsc2022-jmx
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -servercore-ltsc2022-jmx
      - IMG_NEW_TAGS:
        - 7-full,latest-full
-       IMG_TAG_REFERENCE_SUFFIX:
+       SUFFIX:
        - -full
    rules:
    - if: $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_mutable_image_tags
    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_image_tags-a7-fips
  deploy_mutable_image_tags-a7-fips:
    before_script:
-   - VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
?                       +++
      || exit $?
-   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${IMG_TAG_REFERENCE_SUFFIX}
?                                                              ------------------
+   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
+   - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
+     - SUFFIX:
+       - -fips
+       - -fips-jmx
-     - IMG_NEW_TAGS: 7-fips
-       IMG_TAG_REFERENCE_SUFFIX: -fips
-     - IMG_NEW_TAGS: 7-fips-jmx
-       IMG_TAG_REFERENCE_SUFFIX: -fips-jmx
    rules:
    - if: $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_mutable_image_tags
    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
+     TAG_BASE: '7'
deploy_mutable_image_tags-a7_internal
  deploy_mutable_image_tags-a7_internal:
    before_script:
-   - VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
+   - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
?                       +++
      || exit $?
-   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${IMG_TAG_REFERENCE_SUFFIX}
?                                                              ------------------
+   - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
+   - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$CI_IMAGE_DOCKER_X64_SUFFIX:$CI_IMAGE_DOCKER_X64
    parallel:
      matrix:
+     - SUFFIX:
+       - -jmx
+       - -full
+       - -fips-jmx
-     - IMG_NEW_TAGS: 7-jmx
-       IMG_TAG_REFERENCE_SUFFIX: -jmx
-     - IMG_NEW_TAGS: 7-full
-       IMG_TAG_REFERENCE_SUFFIX: -full
-     - IMG_NEW_TAGS: 7-fips-jmx
-       IMG_TAG_REFERENCE_SUFFIX: -fips-jmx
    rules:
    - if: $BUCKET_BRANCH == "beta"
      when: never
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+$/
      variables:
        AGENT_REPOSITORY: ci/datadog-agent/agent-release
        CLUSTER_AGENT_REPOSITORY: ci/datadog-agent/cluster-agent-release
        CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_mutable_image_tags
    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
+     TAG_BASE: '7'

Added Jobs

.deploy_mutable_image_tags_7
.deploy_mutable_image_tags_7:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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_mutable_image_tags
  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
    TAG_BASE: '7'
.deploy_mutable_image_tags_7-rc
.deploy_mutable_image_tags_7-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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_mutable_image_tags
  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
    TAG_BASE: 7-rc
deploy_mutable_image_tags-a7-fips-rc
deploy_mutable_image_tags-a7-fips-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7-fips
  parallel:
    matrix:
    - IMG_NEW_TAGS:
      - 7-fips-rc
      SUFFIX:
      - -fips
    - IMG_NEW_TAGS:
      - 7-fips-rc-jmx
      SUFFIX:
      - -fips-jmx
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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: manual
  - if: $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_mutable_image_tags
  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_image_tags-a7-fips_internal-rc
deploy_mutable_image_tags-a7-fips_internal-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7-fips_internal-rc
  parallel:
    matrix:
    - IMG_NEW_TAGS:
      - 7-fips-rc
      SUFFIX:
      - -fips
    - IMG_NEW_TAGS:
      - 7-fips-rc-jmx
      SUFFIX:
      - -fips-jmx
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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
      CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-release
      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
      IMG_REGISTRIES: internal-aws-ddbuild
      OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
    when: manual
  - if: $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
      CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_mutable_image_tags
  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_image_tags-a7-full-rc
deploy_mutable_image_tags-a7-full-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7-full
  parallel:
    matrix:
    - SUFFIX:
      - -full
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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: manual
  - if: $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_mutable_image_tags
  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
    TAG_BASE: 7-rc
deploy_mutable_image_tags-a7-rc
deploy_mutable_image_tags-a7-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7
  parallel:
    matrix:
    - SUFFIX:
      - ''
      - -jmx
      - -servercore
      - -servercore-jmx
      - -linux
      - -linux-jmx
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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: manual
  - if: $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_mutable_image_tags
  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
    TAG_BASE: 7-rc
deploy_mutable_image_tags-a7-win-only-rc
deploy_mutable_image_tags-a7-win-only-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7-win-only
  parallel:
    matrix:
    - SUFFIX:
      - -ltsc2019
      - -servercore-ltsc2019
      - -ltsc2022
      - -servercore-ltsc2022
      - -ltsc2019-jmx
      - -servercore-ltsc2019-jmx
      - -ltsc2022-jmx
      - -servercore-ltsc2022-jmx
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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: manual
  - if: $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_mutable_image_tags
  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
    TAG_BASE: 7-rc
deploy_mutable_image_tags-a7_internal-rc
deploy_mutable_image_tags-a7_internal-rc:
  before_script:
  - VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)"
    || exit $?
  - export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${SUFFIX}
  - if [[ -z "$IMG_NEW_TAGS" ]]; then IMG_NEW_TAGS=${TAG_BASE}${SUFFIX}; fi
  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-a7_internal-rc
  parallel:
    matrix:
    - SUFFIX:
      - ''
  rules:
  - allow_failure: true
    if: $FORCE_MANUAL == "true" && $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
      CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-release
      DSD_REPOSITORY: ci/datadog-agent/dogstatsd-release
      IMG_REGISTRIES: internal-aws-ddbuild
      OTEL_AGENT_REPOSITORY: ci/datadog-agent/otel-agent-release
    when: manual
  - if: $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
      CWS_INSTRUMENTATION_REPOSITORY: ci/datadog-agent/cws-instrumentation-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_mutable_image_tags
  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
    TAG_BASE: 7-rc

Removed Jobs

  • deploy_containers-a7-rc
  • deploy_containers-a7-fips-rc
  • deploy_containers-a7-full-rc
  • deploy_containers-a7-win-only-rc

Changes Summary

Removed Modified Added Renamed
4 20 8 0

ℹ️ Diff available in the job log.

Copy link

cit-pr-commenter bot commented Jun 6, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 7a31bd65-c65c-4364-8aac-65f72269509b

Baseline: 887a28c
Comparison: afbfeaf
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +0.72 [-2.38, +3.82] 1 Logs
otlp_ingest_logs memory utilization +0.52 [+0.40, +0.64] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.21 [+0.15, +0.27] 1 Logs
quality_gate_idle memory utilization +0.07 [+0.02, +0.13] 1 Logs bounds checks dashboard
ddot_metrics memory utilization +0.06 [-0.06, +0.18] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.04 [-0.60, +0.67] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.02 [-0.59, +0.63] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.01 [-0.60, +0.62] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.01 [-0.62, +0.64] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.00 [-0.62, +0.62] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.00 [-0.28, +0.28] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.00 [-0.61, +0.61] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.01 [-0.03, +0.02] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.01 [-0.24, +0.22] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.04 [-0.66, +0.57] 1 Logs
otlp_ingest_metrics memory utilization -0.15 [-0.31, +0.02] 1 Logs
quality_gate_idle_all_features memory utilization -0.57 [-0.70, -0.43] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization -0.57 [-0.64, -0.50] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.58 [-1.44, +0.28] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.88 [-0.94, -0.83] 1 Logs
ddot_logs memory utilization -1.11 [-1.25, -0.97] 1 Logs
quality_gate_logs % cpu utilization -2.06 [-4.80, +0.69] 1 Logs bounds checks dashboard
file_tree memory utilization -3.63 [-3.82, -3.44] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
docker_containers_memory memory_usage 0/10
docker_containers_cpu simple_check_run 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 memory_usage: 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_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 kacper-murzyn marked this pull request as ready for review June 6, 2025 10:48
@kacper-murzyn kacper-murzyn requested review from a team as code owners June 6, 2025 10:48
@agent-platform-auto-pr
Copy link
Contributor

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

Static quality checks

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

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 DataNotFound $${731.86}$$ < $${752.99}$$ DataNotFound $${181.34}$$ < $${187.44}$$
agent_deb_amd64_fips DataNotFound $${730.15}$$ < $${751.36}$$ DataNotFound $${180.79}$$ < $${187.06}$$
agent_heroku_amd64 DataNotFound $${358.53}$$ < $${369.68}$$ DataNotFound $${96.49}$$ < $${99.55}$$
agent_msi DataNotFound $${959.67}$$ < $${987.01}$$ DataNotFound $${146.43}$$ < $${150.72}$$
agent_rpm_amd64 DataNotFound $${731.85}$$ < $${752.98}$$ DataNotFound $${183.52}$$ < $${190.03}$$
agent_rpm_amd64_fips DataNotFound $${730.14}$$ < $${751.35}$$ DataNotFound $${183.67}$$ < $${189.81}$$
agent_rpm_arm64 DataNotFound $${719.25}$$ < $${739.42}$$ DataNotFound $${165.44}$$ < $${171.23}$$
agent_rpm_arm64_fips DataNotFound $${717.66}$$ < $${737.91}$$ DataNotFound $${164.7}$$ < $${170.22}$$
agent_suse_amd64 DataNotFound $${731.85}$$ < $${752.98}$$ DataNotFound $${183.52}$$ < $${190.03}$$
agent_suse_amd64_fips DataNotFound $${730.14}$$ < $${751.35}$$ DataNotFound $${183.67}$$ < $${189.81}$$
agent_suse_arm64 DataNotFound $${719.25}$$ < $${739.42}$$ DataNotFound $${165.44}$$ < $${171.23}$$
agent_suse_arm64_fips DataNotFound $${717.66}$$ < $${737.91}$$ DataNotFound $${164.7}$$ < $${170.22}$$
docker_agent_amd64 DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_arm64 DataNotFound $${826.49}$$ < $${858.97}$$ DataNotFound $${263.64}$$ < $${274.36}$$
docker_agent_jmx_amd64 DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_jmx_arm64 DataNotFound $${826.49}$$ < $${858.97}$$ DataNotFound $${263.64}$$ < $${274.36}$$
docker_agent_windows1809 DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows1809_core DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows1809_core_jmx DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows1809_jmx DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows2022 DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows2022_core DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows2022_core_jmx DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_agent_windows2022_jmx DataNotFound $${815.65}$$ < $${849.39}$$ DataNotFound $${277.09}$$ < $${288.34}$$
docker_cluster_agent_amd64 DataNotFound $${259.14}$$ < $${259.73}$$ DataNotFound $${102.86}$$ < $${103.68}$$
docker_cluster_agent_arm64 DataNotFound $${273.57}$$ < $${274.24}$$ DataNotFound $${97.57}$$ < $${98.45}$$
docker_cws_instrumentation_amd64 DataNotFound $${7.08}$$ < $${7.12}$$ DataNotFound $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 DataNotFound $${6.69}$$ < $${6.92}$$ DataNotFound $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 DataNotFound $${38.92}$$ < $${39.57}$$ DataNotFound $${14.95}$$ < $${15.76}$$
docker_dogstatsd_arm64 DataNotFound $${37.52}$$ < $${38.2}$$ DataNotFound $${13.96}$$ < $${14.83}$$
dogstatsd_deb_amd64 DataNotFound $${30.61}$$ < $${31.52}$$ DataNotFound $${8.03}$$ < $${8.97}$$
dogstatsd_deb_arm64 DataNotFound $${29.16}$$ < $${30.08}$$ DataNotFound $${6.97}$$ < $${7.92}$$
dogstatsd_rpm_amd64 DataNotFound $${30.61}$$ < $${31.52}$$ DataNotFound $${8.04}$$ < $${8.98}$$
dogstatsd_suse_amd64 DataNotFound $${30.61}$$ < $${31.52}$$ DataNotFound $${8.04}$$ < $${8.98}$$
iot_agent_deb_amd64 DataNotFound $${50.45}$$ < $${60.17}$$ DataNotFound $${12.85}$$ < $${15.82}$$
iot_agent_deb_arm64 DataNotFound $${47.91}$$ < $${56.94}$$ DataNotFound $${11.14}$$ < $${13.86}$$
iot_agent_deb_armhf DataNotFound $${47.49}$$ < $${56.41}$$ DataNotFound $${11.21}$$ < $${13.86}$$
iot_agent_rpm_amd64 DataNotFound $${50.45}$$ < $${60.18}$$ DataNotFound $${12.87}$$ < $${15.84}$$
iot_agent_rpm_arm64 DataNotFound $${47.91}$$ < $${56.94}$$ DataNotFound $${11.16}$$ < $${13.76}$$
iot_agent_suse_amd64 DataNotFound $${50.45}$$ < $${60.18}$$ DataNotFound $${12.87}$$ < $${15.84}$$

!reference [.manual_on_deploy_auto_on_rc]
dependencies: []
before_script:
- VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?
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
- VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?
- VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?

nit, to stay on the safe side even if not strictly required in this case for now

stage: deploy_mutable_image_tags
dependencies: []
before_script:
- VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?
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
- VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?
- VERSION="$(dda inv -- agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?

@kacper-murzyn kacper-murzyn changed the title Update RC publish jobs to push mutable tags only Update image publish jobs for mutable tags to new method Jun 6, 2025
dependencies: []
before_script:
- VERSION="$(dda inv agent.version --url-safe --pipeline-id $PARENT_PIPELINE_ID)" || exit $?
- export IMG_TAG_REFERENCE=${AGENT_REPOSITORY}:${VERSION}${IMG_TAG_REFERENCE_FLAVOR}${IMG_TAG_REFERENCE_WIN_OS}${IMG_TAG_REFERENCE_JMX}
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: can we try to further simplify that with maybe something like ${AGENT_REPOSITORY}:${VERSION}${SUFFIX} ?
I also think IMG_TAG_* variable names can be shortened

Copy link
Contributor Author

Choose a reason for hiding this comment

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

IMG_TAG_REFERENCE has to stay, as it is passed to public-images. I wanted to make those names explicit, but I guess we can use the shortening here.

Copy link
Contributor

Choose a reason for hiding this comment

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

I just think that this might be difficult to read and change for example:

      - IMG_TAG_REFERENCE_FLAVOR:
          - ""
          - "-servercore"
          - "-linux"
        IMG_TAG_REFERENCE_JMX:
          - ""
          - "-jmx"

Where as this would be easier to maintain:

- SUFFIX: ""
- SUFFIX: "-jmx"
- SUFFIX: "-servercore"
- SUFFIX: "-servercore-jmx"
- SUFFIX: "-linux"
- SUFFIX: "-linux-jmx"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, I tried to change it to look more like that and it should work and is much easier to read.

@github-actions github-actions bot added long review PR is complex, plan time to review it and removed medium review PR review might take time labels Jun 6, 2025
@AliDatadog AliDatadog requested a review from Copilot June 6, 2025 12:51
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the image publish jobs during the Agent RC build to use a new method that only creates a tag rather than pushing a whole new index. Key changes include:

  • Defining new job templates for mutable image tag deployments with parallel matrix configurations.
  • Updating and reorganizing job definitions across container deployment and image tag deployment files.
  • Removing obsolete job definitions to simplify the RC build flow.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
.gitlab/deploy_containers/deploy_mutable_image_tags.yml Introduces new job templates and parallel matrix configurations for mutable image tags; removes an internal RC job definition.
.gitlab/deploy_containers/deploy_containers_a7.yml Refactors job definitions for container deployments and adds a new dogstatsd deployment job with updated rules and before_script.
Comments suppressed due to low confidence (1)

.gitlab/deploy_containers/deploy_mutable_image_tags.yml:59

  • There is an inconsistency where some jobs extend the base template using '.deploy_mutable_image_tags_base' while the defined base template is '.deploy_mutable_image_tags-base_rc'. Please verify and update the template reference for consistency.
deploy_mutable_image_tags-a7-full-rc:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog long review PR is complex, plan time to review it qa/rc-required Only for a PR that requires validation on the Release Candidate team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants