Skip to content

Revert changes for cws-instrumentation and dca image publish jobs #37923

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 2 commits into
base: main
Choose a base branch
from

Conversation

kacper-murzyn
Copy link
Contributor

What does this PR do?

Revert #37846 and #37852. The gitlab job cannot have a jobs needing each other in the same stage.

Motivation

Fix pipeline.

…d for mutable tags instead of full index push (#37846)"

This reverts commit b9e4418.
…for mutable tags instead of full index push (#37852)"

This reverts commit 4e1c6c5.
@kacper-murzyn kacper-murzyn requested review from a team as code owners June 13, 2025 10:04
@kacper-murzyn kacper-murzyn added changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation team/agent-delivery backport/7.68.x Automatically create a backport PR to 7.68.x labels Jun 13, 2025
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Jun 13, 2025
@agent-platform-auto-pr
Copy link
Contributor

Gitlab CI Configuration Changes

Modified Jobs

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

Removed Jobs

  • .deploy_mutable_dca_tags-fips-base
  • .deploy_mutable_cws-instrumentation_tags_base
  • .deploy_mutable_dca_tags-base

Changes Summary

Removed Modified Added Renamed
3 10 0 0

ℹ️ Diff available in the job log.

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 271b7194-1f98-4e2c-8715-4f7f9a378b45

Baseline: d2e51b7
Comparison: 6c3d6fa
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +1.39 [-1.39, +4.16] 1 Logs bounds checks dashboard
docker_containers_memory memory utilization +0.92 [+0.84, +1.00] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization +0.76 [+0.68, +0.84] 1 Logs
otlp_ingest_metrics memory utilization +0.15 [-0.01, +0.32] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.13 [-0.46, +0.72] 1 Logs
ddot_logs memory utilization +0.12 [-0.00, +0.24] 1 Logs
ddot_metrics memory utilization +0.10 [-0.02, +0.22] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.10 [-0.50, +0.69] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.06 [+0.01, +0.12] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.06 [-0.55, +0.67] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.06 [-0.53, +0.65] 1 Logs
quality_gate_idle memory utilization +0.04 [-0.03, +0.10] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.04 [-0.59, +0.67] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.01 [-0.59, +0.62] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.02] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.28, +0.27] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.03 [-0.27, +0.21] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.03 [-0.59, +0.52] 1 Logs
otlp_ingest_logs memory utilization -0.25 [-0.38, -0.12] 1 Logs
docker_containers_cpu % cpu utilization -0.69 [-3.70, +2.31] 1 Logs
file_tree memory utilization -0.75 [-0.96, -0.54] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -1.49 [-2.33, -0.65] 1 Logs
quality_gate_idle_all_features memory utilization -2.11 [-2.26, -1.97] 1 Logs bounds checks dashboard

Bounds Checks: ❌ Failed

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

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

Failed. Some Quality Gates were violated.

  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 8/10 replicas passed. Failed 2 which is > 0. Gate FAILED.
  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor

Static quality checks

❌ Please find below the results from static quality gates
Comparison made with ancestor d2e51b7

Error

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
docker_agent_windows1809 $${-0}$$ $${1487.0}$$ > $${1484.8}$$ $${-0.07}$$ $${488.01}$$ < $${488.95}$$
docker_agent_windows1809_core $${-0}$$ $${6216.96}$$ > $${6215.68}$$ $${0}$$ $${2048.0}$$ < $${2048.0}$$
docker_agent_windows1809_jmx $${+0}$$ $${1608.63}$$ > $${1607.68}$$ $${-0.03}$$ $${530.29}$$ < $${531.32}$$
docker_agent_windows2022 $${-0.06}$$ $${1506.23}$$ > $${1505.28}$$ $${-0.02}$$ $${500.77}$$ < $${501.7}$$
docker_agent_windows2022_core_jmx $${+0.03}$$ $${6311.73}$$ > $${6307.84}$$ $${0}$$ $${2048.0}$$ < $${2048.0}$$
Gate failure full details
Quality gate Error type Error message
docker_agent_windows1809 AssertionError Image size on disk (uncompressed image size) 1559230574 is higher than the maximum allowed 1556925644 by the gate !
docker_agent_windows1809_core AssertionError Image size on disk (uncompressed image size) 6518950609 is higher than the maximum allowed 6517612871 by the gate !
docker_agent_windows1809_jmx AssertionError Image size on disk (uncompressed image size) 1686769175 is higher than the maximum allowed 1685774663 by the gate !
docker_agent_windows2022 AssertionError Image size on disk (uncompressed image size) 1579392832 is higher than the maximum allowed 1578400481 by the gate !
docker_agent_windows2022_core_jmx AssertionError Image size on disk (uncompressed image size) 6618323557 is higher than the maximum allowed 6614249635 by the gate !

Static quality gates prevent the PR to merge! You can check the static quality gates confluence page for guidance. We also have a toolbox page available to list tools useful to debug the size increase.

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${0}$$ $${696.37}$$ < $${697.37}$$ $${+0.03}$$ $${176.05}$$ < $${177.03}$$
agent_deb_amd64_fips $${0}$$ $${694.59}$$ < $${695.59}$$ $${-0.02}$$ $${175.48}$$ < $${176.51}$$
agent_heroku_amd64 $${0}$$ $${358.66}$$ < $${359.67}$$ $${-0.01}$$ $${96.52}$$ < $${97.47}$$
agent_msi $${0}$$ $${958.86}$$ < $${959.86}$$ $${0}$$ $${146.28}$$ < $${147.27}$$
agent_rpm_amd64 $${0}$$ $${696.36}$$ < $${697.36}$$ $${+0.02}$$ $${177.63}$$ < $${178.56}$$
agent_rpm_amd64_fips $${0}$$ $${694.58}$$ < $${695.58}$$ $${-0.01}$$ $${177.46}$$ < $${178.43}$$
agent_rpm_arm64 $${0}$$ $${686.36}$$ < $${687.37}$$ $${+0.07}$$ $${161.11}$$ < $${161.99}$$
agent_rpm_arm64_fips $${0}$$ $${684.72}$$ < $${685.72}$$ $${+0.05}$$ $${160.18}$$ < $${161.11}$$
agent_suse_amd64 $${0}$$ $${696.36}$$ < $${697.36}$$ $${+0.02}$$ $${177.63}$$ < $${178.56}$$
agent_suse_amd64_fips $${0}$$ $${694.58}$$ < $${695.58}$$ $${-0.01}$$ $${177.46}$$ < $${178.43}$$
agent_suse_arm64 $${0}$$ $${686.36}$$ < $${687.37}$$ $${+0.07}$$ $${161.11}$$ < $${161.99}$$
agent_suse_arm64_fips $${0}$$ $${684.72}$$ < $${685.72}$$ $${+0.05}$$ $${160.18}$$ < $${161.11}$$
docker_agent_amd64 $${-0}$$ $${780.16}$$ < $${781.16}$$ $${+0}$$ $${268.68}$$ < $${269.63}$$
docker_agent_arm64 $${+0}$$ $${793.62}$$ < $${794.62}$$ $${-0}$$ $${256.05}$$ < $${257.0}$$
docker_agent_jmx_amd64 $${0}$$ $${971.35}$$ < $${972.35}$$ $${+0}$$ $${337.66}$$ < $${338.6}$$
docker_agent_jmx_arm64 $${-0}$$ $${973.41}$$ < $${974.41}$$ $${+0}$$ $${320.99}$$ < $${321.97}$$
docker_agent_windows1809_core_jmx $${-0}$$ $${6338.53}$$ < $${6338.56}$$ $${0}$$ $${2048.0}$$ < $${2048.0}$$
docker_agent_windows2022_core $${-0.22}$$ $${6189.8}$$ < $${6195.2}$$ $${0}$$ $${2048.0}$$ < $${2048.0}$$
docker_agent_windows2022_jmx $${+0}$$ $${1627.88}$$ < $${1628.16}$$ $${+0.03}$$ $${543.09}$$ < $${543.98}$$
docker_cluster_agent_amd64 $${-0}$$ $${212.84}$$ < $${213.79}$$ $${+0}$$ $${72.38}$$ < $${73.33}$$
docker_cluster_agent_arm64 $${+0}$$ $${228.68}$$ < $${229.64}$$ $${+0}$$ $${68.64}$$ < $${69.6}$$
docker_cws_instrumentation_amd64 $${0}$$ $${7.08}$$ < $${7.12}$$ $${-0}$$ $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${0}$$ $${6.69}$$ < $${6.92}$$ $${-0}$$ $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${0}$$ $${39.22}$$ < $${39.57}$$ $${-0}$$ $${15.12}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${0}$$ $${37.88}$$ < $${38.2}$$ $${0}$$ $${14.54}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${30.44}$$ < $${31.4}$$ $${+0}$$ $${8.0}$$ < $${8.95}$$
dogstatsd_deb_arm64 $${0}$$ $${29.02}$$ < $${29.97}$$ $${-0}$$ $${6.94}$$ < $${7.89}$$
dogstatsd_rpm_amd64 $${0}$$ $${30.44}$$ < $${31.4}$$ $${+0}$$ $${8.0}$$ < $${8.96}$$
dogstatsd_suse_amd64 $${0}$$ $${30.44}$$ < $${31.4}$$ $${+0}$$ $${8.0}$$ < $${8.96}$$
iot_agent_deb_amd64 $${0}$$ $${50.42}$$ < $${51.38}$$ $${-0}$$ $${12.84}$$ < $${13.79}$$
iot_agent_deb_arm64 $${0}$$ $${47.9}$$ < $${48.85}$$ $${-0}$$ $${11.14}$$ < $${12.09}$$
iot_agent_deb_armhf $${0}$$ $${47.47}$$ < $${48.42}$$ $${+0}$$ $${11.2}$$ < $${12.16}$$
iot_agent_rpm_amd64 $${0}$$ $${50.42}$$ < $${51.38}$$ $${+0}$$ $${12.86}$$ < $${13.81}$$
iot_agent_rpm_arm64 $${0}$$ $${47.9}$$ < $${48.85}$$ $${+0}$$ $${11.16}$$ < $${12.11}$$
iot_agent_suse_amd64 $${0}$$ $${50.42}$$ < $${51.38}$$ $${+0}$$ $${12.86}$$ < $${13.81}$$

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/7.68.x Automatically create a backport PR to 7.68.x changelog/no-changelog qa/no-code-change No code change in Agent code requiring validation short review PR is simple enough to be reviewed quickly team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants