Skip to content
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

[BARX-598] Deploy new 2022 and 2019 windows images #31178

Merged
merged 5 commits into from
Nov 21, 2024

Conversation

AliDatadog
Copy link
Contributor

@AliDatadog AliDatadog commented Nov 18, 2024

What does this PR do?

This PR creates new ltsc2019 and ltsc2022 images.

Motivation

See associated card + containerd/containerd#6508

Describe how to test/QA your changes

Deployed as part of this pipeline (required a backport + custom image) https://gitlab.ddbuild.io/DataDog/datadog-agent/-/pipelines/49488013. You can check that all the images listed in the release notes are published and that the manifest matches only a single platform. Example:

❯ crane manifest docker.io/datadog/agent-dev:ali-propose-new-win-images-py3-win-ltsc2019 | jq
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
  "manifests": [
    {
      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
      "size": 7829,
      "digest": "sha256:b4eeeea461781758903f05316a49886943adfa15001157205a202ee78ef1833d",
      "platform": {
        "architecture": "amd64",
        "os": "windows",
        "os.version": "10.0.17763.6414"
      }
    }
  ]
}
❯ crane manifest docker.io/datadog/agent-dev:ali-propose-new-win-images-py3-win-servercore-ltsc2019 | jq
{
  "schemaVersion": 2,
  "mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
  "manifests": [
    {
      "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
      "size": 6114,
      "digest": "sha256:ea087800300e2b8ec08af4397480db190f194ffd9ae4d40b2af7b04638992f31",
      "platform": {
        "architecture": "amd64",
        "os": "windows",
        "os.version": "10.0.17763.1697"
      }
    }
  ]
}

This can only be check on new release candidates

Possible Drawbacks / Trade-offs

Additional Notes

@AliDatadog AliDatadog added this to the 7.61.0 milestone Nov 18, 2024
@AliDatadog AliDatadog requested review from a team as code owners November 18, 2024 13:39
@github-actions github-actions bot added the short review PR is simple enough to be reviewed quickly label Nov 18, 2024
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Nov 18, 2024

[Fast Unit Tests Report]

On pipeline 49487606 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_deb-arm64-py3
  • tests_deb-x64-py3
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64
  • tests_rpm-arm64-py3
  • tests_rpm-x64-py3
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

Copy link

cit-pr-commenter bot commented Nov 18, 2024

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: b85a4994-798f-4644-8b3a-b3d972ad1e25

Baseline: 8dc9452
Comparison: 2efcd2e
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
pycheck_lots_of_tags % cpu utilization +1.22 [-2.31, +4.75] 1 Logs
quality_gate_idle_all_features memory utilization +0.53 [+0.42, +0.64] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.32 [-0.45, +1.09] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.09 [-0.38, +0.55] 1 Logs
file_tree memory utilization +0.03 [-0.10, +0.16] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.10, +0.11] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.01, +0.01] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.05 [-0.90, +0.80] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.11 [-0.75, +0.53] 1 Logs
otel_to_otel_logs ingress throughput -0.18 [-0.84, +0.48] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.20 [-0.94, +0.54] 1 Logs
file_to_blackhole_1000ms_latency egress throughput -0.36 [-1.18, +0.45] 1 Logs
quality_gate_idle memory utilization -0.80 [-0.84, -0.75] 1 Logs bounds checks dashboard
tcp_syslog_to_blackhole ingress throughput -1.02 [-1.10, -0.94] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -1.23 [-1.95, -0.51] 1 Logs
basic_py_check % cpu utilization -4.94 [-8.72, -1.17] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_1000ms_latency lost_bytes 0/10
file_to_blackhole_300ms_latency lost_bytes 7/10
file_to_blackhole_0ms_latency lost_bytes 9/10
file_to_blackhole_500ms_latency lost_bytes 9/10
file_to_blackhole_0ms_latency 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 memory_usage 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features 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_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@AliDatadog AliDatadog force-pushed the ali/propose-new-win-images branch from d798053 to 7e5e8ee Compare November 18, 2024 14:31
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Nov 18, 2024

Gitlab CI Configuration Changes

Updated: .gitlab-ci.yml

Modified Jobs

dev_branch-a7-windows
  dev_branch-a7-windows:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - docker_build_agent7_windows1809
    - docker_build_agent7_windows1809_jmx
    - docker_build_agent7_windows1809_core
    - docker_build_agent7_windows1809_core_jmx
    - docker_build_agent7_windows2022
    - docker_build_agent7_windows2022_jmx
    - docker_build_agent7_windows2022_core
    - docker_build_agent7_windows2022_core_jmx
    parallel:
      matrix:
      - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
      - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - 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_SIGNING --variable APPS
      --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV
      --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: dev_container_deploy
    tags:
    - arch:amd64
    variables:
      IMG_REGISTRIES: dev
      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
dev_master-a7-windows
  dev_master-a7-windows:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - docker_build_agent7_windows1809
    - docker_build_agent7_windows1809_jmx
    - docker_build_agent7_windows1809_core
    - docker_build_agent7_windows1809_core_jmx
    - docker_build_agent7_windows2022
    - docker_build_agent7_windows2022_jmx
    - docker_build_agent7_windows2022_core
    - docker_build_agent7_windows2022_core_jmx
    parallel:
      matrix:
      - IMG_DESTINATIONS: agent-dev:master-py3-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:master-py3-jmx-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
      - IMG_DESTINATIONS: agent-dev:master-py3-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:master-py3-jmx-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
    rules:
    - if: $CI_COMMIT_BRANCH == "main"
    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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - 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_SIGNING --variable APPS
      --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV
      --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: dev_container_deploy
    tags:
    - arch:amd64
    variables:
      IMG_REGISTRIES: dev
      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
dev_nightly-a7-windows
  dev_nightly-a7-windows:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - docker_build_agent7_windows1809
    - docker_build_agent7_windows1809_jmx
    - docker_build_agent7_windows1809_core
    - docker_build_agent7_windows1809_core_jmx
    - docker_build_agent7_windows2022
    - docker_build_agent7_windows2022_jmx
    - docker_build_agent7_windows2022_core
    - docker_build_agent7_windows2022_core_jmx
    parallel:
      matrix:
      - IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-jmx-win
        IMG_SOURCES: '%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
      - IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: agent-dev:nightly-${CI_COMMIT_SHORT_SHA}-py3-jmx-win-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: agent-dev:${CI_COMMIT_REF_SLUG}-py3-jmx-win-servercore-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
    rules:
    - if: $BUCKET_BRANCH != "nightly" && $BUCKET_BRANCH != "oldnightly" && $BUCKET_BRANCH
        != "dev"
      when: never
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
    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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - 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_SIGNING --variable APPS
      --variable BAZEL_TARGET --variable DDR --variable DDR_WORKFLOW_ID --variable TARGET_ENV
      --variable DYNAMIC_BUILD_RENDER_TARGET_FORWARD_PARAMETERS
    stage: dev_container_deploy
    tags:
    - arch:amd64
    variables:
      IMG_REGISTRIES: dev
      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

Changes Summary

Removed Modified Added Renamed
0 3 0 0

Updated: .gitlab/deploy_containers/deploy_containers_a7.yml

Modified Jobs

deploy_containers_latest-a7
  deploy_containers_latest-a7:
    dependencies: []
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/docker_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    parallel:
      matrix:
      - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7,${AGENT_REPOSITORY}:latest
        IMG_SOURCES: '%BASE%-amd64,%BASE%-arm64,%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-jmx,${AGENT_REPOSITORY}:latest-jmx
        IMG_SOURCES: '%BASE%-amd64,%BASE%-arm64,%BASE%-win1809-amd64,%BASE%-winltsc2022-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
      - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore,${AGENT_REPOSITORY}:latest-servercore
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
      - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-jmx,${AGENT_REPOSITORY}:latest-servercore-jmx
        IMG_SOURCES: '%BASE%-win1809-servercore-amd64,%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7,${AGENT_REPOSITORY}:latest-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7,${AGENT_REPOSITORY}:latest-ltsc2022
+       IMG_SOURCES: '%BASE%-winltsc2022-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2019,${AGENT_REPOSITORY}:latest-servercore-ltsc2019
+       IMG_SOURCES: '%BASE%-win1809-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2022,${AGENT_REPOSITORY}:latest-servercore-ltsc2022
+       IMG_SOURCES: BASE%-winltsc2022-servercore-amd64
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2022-jmx,${AGENT_REPOSITORY}:latest-servercore-ltsc2022-jmx
+       IMG_SOURCES: '%BASE%-winltsc2022-servercore-amd64'
+       IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-jmx
+     - IMG_DESTINATIONS: ${AGENT_REPOSITORY}:7-servercore-ltsc2019-jmx,${AGENT_REPOSITORY}:latest-servercore-ltsc2019-jmx
+       IMG_SOURCES: '%BASE%-winltsc1809-servercore-amd64'
        IMG_VARIABLES: BASE=${SRC_AGENT}:v${PARENT_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}-7-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
      when: manual
    - allow_failure: true
      variables:
        AGENT_REPOSITORY: agent
        DSD_REPOSITORY: dogstatsd
        IMG_REGISTRIES: public
      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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_VARIABLES")"
    - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
      <<<"$IMG_SOURCES")"
    - 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_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

Added Jobs

.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="$(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$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - 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_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
.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="$(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$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - 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_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
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="$(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$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  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
    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
    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
    when: manual
  - allow_failure: true
    variables:
      AGENT_REPOSITORY: agent
      DSD_REPOSITORY: dogstatsd
      IMG_REGISTRIES: public
    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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - 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_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
deploy_containers-a7-win-only-rc
deploy_containers-a7-win-only-rc:
  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="$(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$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  parallel:
    matrix:
    - FLAVOR:
      - ''
      - -servercore
      JMX:
      - ''
      - -jmx
      OS_LTSC_MAPPING:
      - ltsc2022:2022
      - 1809:2019
  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
    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
    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_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_VARIABLES")"
  - IMG_SOURCES="$(sed -E "s#(${SRC_AGENT}|${SRC_DSD}|${SRC_DCA}|${SRC_CWS_INSTRUMENTATION})#\1${ECR_RELEASE_SUFFIX}#g"
    <<<"$IMG_SOURCES")"
  - 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_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
    VERSION: 7-rc

Changes Summary

Removed Modified Added Renamed
0 1 4 0

ℹ️ Diff available in the job log.

@AliDatadog AliDatadog force-pushed the ali/propose-new-win-images branch from 7e5e8ee to 2f80939 Compare November 18, 2024 14:44
@AliDatadog AliDatadog requested a review from a team as a code owner November 18, 2024 14:44
@AliDatadog AliDatadog force-pushed the ali/propose-new-win-images branch from 2f80939 to 7357616 Compare November 19, 2024 12:42
@AliDatadog AliDatadog force-pushed the ali/propose-new-win-images branch from 7357616 to a9e74b8 Compare November 20, 2024 09:49
@AliDatadog AliDatadog requested a review from a team as a code owner November 20, 2024 12:42
@github-actions github-actions bot added medium review PR review might take time and removed short review PR is simple enough to be reviewed quickly labels Nov 20, 2024
@aliciascott aliciascott self-assigned this Nov 20, 2024
@AliDatadog
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Nov 21, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-11-21 09:22:09 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 25m.

@dd-mergequeue dd-mergequeue bot merged commit b6c9803 into main Nov 21, 2024
216 checks passed
@dd-mergequeue dd-mergequeue bot deleted the ali/propose-new-win-images branch November 21, 2024 09:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
medium review PR review might take time team/agent-delivery
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants