Skip to content

test instance store windows runner #37907

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

jorgetomtz
Copy link
Contributor

Problem

Solution

Testing Done

@github-actions github-actions bot added team/agent-devx short review PR is simple enough to be reviewed quickly labels Jun 12, 2025
@agent-platform-auto-pr
Copy link
Contributor

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

Gitlab CI Configuration Changes

Modified Jobs

.integration_tests_windows_base
  .integration_tests_windows_base:
    before_script:
    - $tmpfile = [System.IO.Path]::GetTempFileName()
    - (& "$CI_PROJECT_DIR\tools\ci\fetch_secret.ps1" -parameterName "$Env:VCPKG_BLOB_SAS_URL"
      -tempFile "$tmpfile")
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    - $vcpkgBlobSaSUrl=$(cat "$tmpfile")
    - Remove-Item "$tmpfile"
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e CI_JOB_URL="${CI_JOB_URL}"
      -e CI_JOB_NAME="${CI_JOB_NAME}" -e CI_PIPELINE_ID="${CI_PIPELINE_ID}" -e CI_PROJECT_NAME="${CI_PROJECT_NAME}"
      -e AWS_NETWORKING=true -e GOMODCACHE="c:\modcache" -e VCPKG_BINARY_SOURCES="clear;x-azblob,${vcpkgBlobSaSUrl}"
      -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE} powershell.exe -c "c:\mnt\tasks\winbuildscripts\Invoke-IntegrationTests.ps1
      -BuildOutOfSource 1 -CheckGoVersion 1 -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: integration_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.lint_windows_base
  .lint_windows_base:
    needs:
    - go_deps
    - go_tools_deps
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 24576M --storage-opt "size=50GB" -v "$(Get-Location):c:\mnt"
      -e AWS_NETWORKING=true -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME}
      -e GOMODCACHE="c:\modcache" -e RUST_LOG="uv=trace" ${WINBUILDIMAGE} powershell.exe
      -c "c:\mnt\tasks\winbuildscripts\Invoke-Linters.ps1 -BuildOutOfSource 1 -CheckGoVersion
      1 -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: lint
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.tests_windows_base
  .tests_windows_base:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        junit: '**/junit-out-*.xml'
      when: always
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $RUN_UNIT_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH == "main"
      variables:
        COVERAGE_CACHE_FLAG: --push-coverage-cache
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_TAG != null
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $RUN_UNIT_TESTS == "on"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - variables:
        COVERAGE_CACHE_FLAG: --pull-coverage-cache
        FAST_TESTS: 'true'
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $FAST_TESTS_FLAG=""
    - If ($FAST_TESTS -eq "true") { $FAST_TESTS_FLAG="--only-impacted-packages" }
    - 'docker run --rm -m 24576M --storage-opt "size=50GB" -v "$(Get-Location):c:\mnt"
      -e DD_ENV=prod -e GITLAB_CI=true -e CI_JOB_URL="${CI_JOB_URL}" -e CI_JOB_NAME="${CI_JOB_NAME}"
      -e CI_JOB_ID="${CI_JOB_ID}" -e CI_PIPELINE_ID="${CI_PIPELINE_ID}" -e CI_PIPELINE_SOURCE="${CI_PIPELINE_SOURCE}"
      -e CI_REPOSITORY_URL="${CI_REPOSITORY_URL}" -e CI_COMMIT_SHA="${CI_COMMIT_SHA}"
      -e CI_PROJECT_NAME="${CI_PROJECT_NAME}" -e CI_COMMIT_REF_NAME="${CI_COMMIT_REF_NAME}"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e GOMODCACHE="c:\modcache"
      -e JUNIT_TAR="c:\mnt\junit-${CI_JOB_NAME}.tgz" -e PIP_INDEX_URL="${PIP_INDEX_URL}"
      -e TEST_OUTPUT_FILE="${TEST_OUTPUT_FILE}" -e EXTRA_OPTS="${FAST_TESTS_FLAG}" -e
      TEST_WASHER=true -e GO_TEST_SKIP_FLAKE="${GO_TEST_SKIP_FLAKE}" -e API_KEY_ORG2="${API_KEY_ORG2}"
      -e CODECOV_TOKEN="${CODECOV_TOKEN}" -e S3_PERMANENT_ARTIFACTS_URI="${S3_PERMANENT_ARTIFACTS_URI}"
      -e COVERAGE_CACHE_FLAG="${COVERAGE_CACHE_FLAG}" -e FLAKY_PATTERNS_CONFIG="\mnt\flaky-patterns-runtime.yaml"
      ${WINBUILDIMAGE} powershell.exe -c "c:\mnt\tasks\winbuildscripts\Invoke-UnitTests.ps1
      -BuildOutOfSource 1 -CheckGoVersion 1 -InstallDeps 1 -UploadCoverage 1 -UploadTestResults
      1"
  
      '
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      TEST_OUTPUT_FILE: test_output.json
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.tests_windows_secagent
  .tests_windows_secagent:
    artifacts:
      paths:
      - $CI_PROJECT_DIR/test/new-e2e/tests/security-agent-functional/artifacts
      when: always
    needs:
    - go_deps
    - go_tools_deps
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e SIGN_WINDOWS_DD_WCS=true
      -e GOMODCACHE="c:\modcache" -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE}
      c:\mnt\tasks\winbuildscripts\secagent.bat
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.tests_windows_sysprobe
  .tests_windows_sysprobe:
    artifacts:
      paths:
      - $CI_PROJECT_DIR/test/new-e2e/tests/sysprobe-functional/artifacts
      when: always
    needs:
    - go_deps
    - go_tools_deps
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e SIGN_WINDOWS_DD_WCS=true
      -e GOMODCACHE="c:\modcache" -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE}
      c:\mnt\tasks\winbuildscripts\sysprobe.bat
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_choco_7_x64
  .windows_choco_7_x64:
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: manual
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
    script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $ErrorActionPreference = "Stop"
    - if (Test-Path build-out) { remove-item -recurse -force build-out }
    - 'docker run --rm -v "$(Get-Location):c:\mnt" -e CI_PROJECT_NAME=${CI_PROJECT_NAME}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e BUCKET_BRANCH="$BUCKET_BRANCH" -e AWS_NETWORKING=true
      ${WINBUILDIMAGE} powershell.exe -C "C:\mnt\tasks\winbuildscripts\Generate-Chocolatey-Package.ps1
      -MSIDirectory c:\mnt\omnibus\pkg -Flavor $FLAVOR -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - $CopyNupkgToS3 = "$S3_CP_CMD --recursive --exclude '*' --include '*.nupkg' build-out
      $S3_RELEASE_ARTIFACTS_URI/choco/nupkg"
    - Invoke-Expression $CopyNupkgToS3
    stage: choco_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_docker_2022
  .windows_docker_2022:
    tags:
-   - runner:windows-docker
-   - windowsversion:2022
?             ^^^^^^
+   - windows-v2:2022
?            + ^
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_docker_default
  .windows_docker_default:
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_docker_v2_2022
  .windows_docker_v2_2022:
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_main_agent_base
  .windows_main_agent_base:
    after_script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_deps
    script:
    - $ErrorActionPreference = 'Stop'
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 24576M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG} -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
      -e OMNIBUS_TARGET=${OMNIBUS_TARGET} -e WINDOWS_BUILDER=true -e MAJOR_VERSION="7"
      -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION" -e GOMODCACHE="c:\modcache"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e TARGET_ARCH="$ARCH" -e DEBUG_CUSTOMACTION="$DEBUG_CUSTOMACTION"
      -e BUCKET_BRANCH="$BUCKET_BRANCH" -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET"
      -e S3_OMNIBUS_GIT_CACHE_BUCKET="$S3_OMNIBUS_GIT_CACHE_BUCKET" -e INTEGRATION_WHEELS_CACHE_BUCKET="$INTEGRATION_WHEELS_CACHE_BUCKET"
      -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG} -e PIP_INDEX_URL=${PIP_INDEX_URL}
      -e API_KEY_ORG2=${API_KEY_ORG2} -e OMNIBUS_GIT_CACHE_DIR=${Env:TEMP}/${CI_PIPELINE_ID}/omnibus-git-cache
      -e AGENT_FLAVOR=${AGENT_FLAVOR} -e OMNIBUS_RUBY_VERSION="${OMNIBUS_RUBY_VERSION}"
      -e PYTHONUTF8=1 ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1 -BuildUpgrade 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem omnibus\pkg
    - Invoke-Expression "$S3_CP_CMD omnibus\pkg\version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      OMNIBUS_TARGET: main
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
.windows_msi_base
  .windows_msi_base:
    after_script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_deps
    script:
    - $ErrorActionPreference = 'Stop'
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 24576M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG} -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
      -e OMNIBUS_TARGET=${OMNIBUS_TARGET} -e WINDOWS_BUILDER=true -e MAJOR_VERSION="7"
      -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION" -e GOMODCACHE="c:\modcache"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e TARGET_ARCH="$ARCH" -e DEBUG_CUSTOMACTION="$DEBUG_CUSTOMACTION"
      -e BUCKET_BRANCH="$BUCKET_BRANCH" -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET"
      -e S3_OMNIBUS_GIT_CACHE_BUCKET="$S3_OMNIBUS_GIT_CACHE_BUCKET" -e INTEGRATION_WHEELS_CACHE_BUCKET="$INTEGRATION_WHEELS_CACHE_BUCKET"
      -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG} -e PIP_INDEX_URL=${PIP_INDEX_URL}
      -e API_KEY_ORG2=${API_KEY_ORG2} -e OMNIBUS_GIT_CACHE_DIR=${Env:TEMP}/${CI_PIPELINE_ID}/omnibus-git-cache
      -e AGENT_FLAVOR=${AGENT_FLAVOR} -e OMNIBUS_RUBY_VERSION="${OMNIBUS_RUBY_VERSION}"
      -e PYTHONUTF8=1 ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1 -BuildUpgrade 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem omnibus\pkg
    - Invoke-Expression "$S3_CP_CMD omnibus\pkg\version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
build_windows_container_entrypoint
  build_windows_container_entrypoint:
    artifacts:
      expire_in: 2 weeks
      paths:
      - entrypoint.exe
    needs:
    - lint_windows-x64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path build-out) { remove-item -recurse -force build-out }
    - 'docker run --rm -m 8192M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e WINDOWS_BUILDER=true
      -e AWS_NETWORKING=true -e TARGET_ARCH="$ARCH" ${WINBUILDIMAGE} c:\mnt\Dockerfiles\agent\windows\entrypoint\build.bat
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem build-out\${CI_JOB_ID}
    - copy build-out\${CI_JOB_ID}\*.exe ./entrypoint.exe
    - remove-item -recurse -force build-out\${CI_JOB_ID}
    stage: binary_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
docker_build_agent7_windows2022
  docker_build_agent7_windows2022:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - setup_agent_version
    - windows_msi_and_bosh_zip_x64-a7
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg VARIANT=${VARIANT} --build-arg
        INSTALL_INFO=nano-${VARIANT}
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: '-7'
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'false'
docker_build_agent7_windows2022_core
  docker_build_agent7_windows2022_core:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - setup_agent_version
    - windows_msi_and_bosh_zip_x64-a7
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg VARIANT=${VARIANT} --build-arg
        INSTALL_INFO=core-${VARIANT}
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      SERVERCORE: -servercore
      TAG_SUFFIX: '-7'
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'false'
docker_build_agent7_windows2022_core_jmx
  docker_build_agent7_windows2022_core_jmx:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - setup_agent_version
    - windows_msi_and_bosh_zip_x64-a7
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg VARIANT=${VARIANT} --build-arg
        INSTALL_INFO=core-${VARIANT}
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      SERVERCORE: -servercore
      TAG_SUFFIX: -7-jmx
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'true'
docker_build_agent7_windows2022_jmx
  docker_build_agent7_windows2022_jmx:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - setup_agent_version
    - windows_msi_and_bosh_zip_x64-a7
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg VARIANT=${VARIANT} --build-arg
        INSTALL_INFO=nano-${VARIANT}
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      TAG_SUFFIX: -7-jmx
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'true'
docker_build_fips_agent7_windows2022_core
  docker_build_fips_agent7_windows2022_core:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - windows_msi_and_bosh_zip_x64-a7-fips
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-fips-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg VARIANT=${VARIANT}
        --build-arg INSTALL_INFO=core-${VARIANT}-fips
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      SERVERCORE: -servercore
      TAG_SUFFIX: -7-fips
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'false'
docker_build_fips_agent7_windows2022_core_jmx
  docker_build_fips_agent7_windows2022_core_jmx:
    id_tokens:
      CI_IDENTITY_GITLAB_JWT:
        aud: https://vault.us1.ddbuild.io
    needs:
    - windows_msi_and_bosh_zip_x64-a7-fips
    - build_windows_container_entrypoint
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ECR_RELEASE_SUFFIX="$(If ($BUCKET_BRANCH -eq `"nightly`") { `"-nightly`" } elseif
      ($CI_COMMIT_TAG) { `"-release`" } else { `"`" })"
    - $TARGET_TAG="${IMAGE}${ECR_RELEASE_SUFFIX}:v${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}${TAG_SUFFIX}-win${VARIANT}${SERVERCORE}-amd64"
    - $BUILD_DATE = Get-Date -Format "yyyy-MM-ddTHH:mm:ssZ"
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - cp ${OMNIBUS_PACKAGE_DIR}/${AGENT_ZIP} ${BUILD_CONTEXT}/datadog-agent-latest.amd64.zip
    - cp entrypoint.exe ${BUILD_CONTEXT}/entrypoint.exe
    - pushd ${BUILD_CONTEXT}
    - Expand-Archive datadog-agent-latest.amd64.zip
    - Remove-Item datadog-agent-latest.amd64.zip
    - Get-ChildItem -Path datadog-agent-* | Rename-Item -NewName "Datadog Agent"
    - popd
    - get-childitem ${BUILD_CONTEXT}
    - 'powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker build --no-cache
      --build-arg GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL}
      ${BUILD_ARG} --pull --file ${BUILD_CONTEXT}/windows/amd64/Dockerfile --tag ${TARGET_TAG}
      --label ''org.opencontainers.image.created=${BUILD_DATE}'' --label ''org.opencontainers.image.version=${AGENT_VERSION}''
      --label ''org.opencontainers.image.revision=${CI_COMMIT_SHA}'' ${BUILD_CONTEXT}"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - powershell -Command "$(Get-Location)\tools\ci\retry.ps1 docker push ${TARGET_TAG}"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - docker rmi ${TARGET_TAG}
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: container_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      AGENT_ZIP: datadog-fips-agent-7*-x86_64.zip
      BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT}
        --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg VARIANT=${VARIANT}
        --build-arg INSTALL_INFO=core-${VARIANT}-fips
      BUILD_CONTEXT: Dockerfiles/agent
      CI_IDENTITY_ROLE_NAME_OVERRIDE: windows-ci-tmp-gitlab-id-token-datadog-agent-all-refs
      IMAGE: registry.ddbuild.io/ci/datadog-agent/agent
      SERVERCORE: -servercore
      TAG_SUFFIX: -7-fips-jmx
      VARIANT: ltsc2022
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
      WITH_JMX: 'true'
integration_tests_windows-x64
  integration_tests_windows-x64:
    before_script:
    - $tmpfile = [System.IO.Path]::GetTempFileName()
    - (& "$CI_PROJECT_DIR\tools\ci\fetch_secret.ps1" -parameterName "$Env:VCPKG_BLOB_SAS_URL"
      -tempFile "$tmpfile")
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    - $vcpkgBlobSaSUrl=$(cat "$tmpfile")
    - Remove-Item "$tmpfile"
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e CI_JOB_URL="${CI_JOB_URL}"
      -e CI_JOB_NAME="${CI_JOB_NAME}" -e CI_PIPELINE_ID="${CI_PIPELINE_ID}" -e CI_PROJECT_NAME="${CI_PROJECT_NAME}"
      -e AWS_NETWORKING=true -e GOMODCACHE="c:\modcache" -e VCPKG_BINARY_SOURCES="clear;x-azblob,${vcpkgBlobSaSUrl}"
      -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE} powershell.exe -c "c:\mnt\tasks\winbuildscripts\Invoke-IntegrationTests.ps1
      -BuildOutOfSource 1 -CheckGoVersion 1 -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: integration_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
lint_windows-x64
  lint_windows-x64:
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 24576M --storage-opt "size=50GB" -v "$(Get-Location):c:\mnt"
      -e AWS_NETWORKING=true -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME}
      -e GOMODCACHE="c:\modcache" -e RUST_LOG="uv=trace" ${WINBUILDIMAGE} powershell.exe
      -c "c:\mnt\tasks\winbuildscripts\Invoke-Linters.ps1 -BuildOutOfSource 1 -CheckGoVersion
      1 -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: lint
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    timeout: 1h30m
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
powershell_script_signing
  powershell_script_signing:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $WINDOWS_POWERSHELL_DIR
    needs: []
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - mkdir $WINDOWS_POWERSHELL_DIR
    - docker run --rm -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true -e IS_AWS_CONTAINER=true
      ${WINBUILDIMAGE} powershell -C "dd-wcs sign \mnt\tools\windows\DatadogAgentInstallScript\Install-Datadog.ps1"
    - copy .\tools\windows\DatadogAgentInstallScript\Install-Datadog.ps1 $WINDOWS_POWERSHELL_DIR\Install-Datadog.ps1
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
publish_winget_7_x64
  publish_winget_7_x64:
    before_script:
    - $tmpfile = [System.IO.Path]::GetTempFileName()
    - (& "$CI_PROJECT_DIR\tools\ci\fetch_secret.ps1" -parameterName "$Env:WINGET_PAT"
      -tempFile "$tmpfile")
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    - $wingetPat=$(cat "$tmpfile")
    - Remove-Item "$tmpfile"
    dependencies: []
    rules:
    - if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: never
    - allow_failure: true
      if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
      when: manual
    script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $ErrorActionPreference = "Stop"
    - 'docker run --rm -v "$(Get-Location):c:\mnt" -e WINGET_GITHUB_ACCESS_TOKEN=${wingetPat}
      -e GENERAL_ARTIFACTS_CACHE_BUCKET_URL=${GENERAL_ARTIFACTS_CACHE_BUCKET_URL} ${WINBUILDIMAGE}
      Powershell -C "C:\mnt\tasks\winbuildscripts\Update-Winget.ps1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: deploy_packages
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
tests_windows-x64
  tests_windows-x64:
    artifacts:
      expire_in: 2 weeks
      paths:
      - $TEST_OUTPUT_FILE
      - junit-*.tgz
      reports:
        junit:
        - '**/junit-out-*.xml'
      when: always
    needs:
    - go_deps
    - go_tools_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $RUN_UNIT_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH == "main"
      variables:
        COVERAGE_CACHE_FLAG: --push-coverage-cache
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_COMMIT_TAG != null
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $CI_PIPELINE_SOURCE == "trigger" || $CI_PIPELINE_SOURCE == "pipeline"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - if: $RUN_UNIT_TESTS == "on"
      variables:
        COVERAGE_CACHE_FLAG: ''
        FAST_TESTS: 'false'
    - variables:
        COVERAGE_CACHE_FLAG: --pull-coverage-cache
        FAST_TESTS: 'true'
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $FAST_TESTS_FLAG=""
    - If ($FAST_TESTS -eq "true") { $FAST_TESTS_FLAG="--only-impacted-packages" }
    - 'docker run --rm -m 24576M --storage-opt "size=50GB" -v "$(Get-Location):c:\mnt"
      -e DD_ENV=prod -e GITLAB_CI=true -e CI_JOB_URL="${CI_JOB_URL}" -e CI_JOB_NAME="${CI_JOB_NAME}"
      -e CI_JOB_ID="${CI_JOB_ID}" -e CI_PIPELINE_ID="${CI_PIPELINE_ID}" -e CI_PIPELINE_SOURCE="${CI_PIPELINE_SOURCE}"
      -e CI_REPOSITORY_URL="${CI_REPOSITORY_URL}" -e CI_COMMIT_SHA="${CI_COMMIT_SHA}"
      -e CI_PROJECT_NAME="${CI_PROJECT_NAME}" -e CI_COMMIT_REF_NAME="${CI_COMMIT_REF_NAME}"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e GOMODCACHE="c:\modcache"
      -e JUNIT_TAR="c:\mnt\junit-${CI_JOB_NAME}.tgz" -e PIP_INDEX_URL="${PIP_INDEX_URL}"
      -e TEST_OUTPUT_FILE="${TEST_OUTPUT_FILE}" -e EXTRA_OPTS="${FAST_TESTS_FLAG}" -e
      TEST_WASHER=true -e GO_TEST_SKIP_FLAKE="${GO_TEST_SKIP_FLAKE}" -e API_KEY_ORG2="${API_KEY_ORG2}"
      -e CODECOV_TOKEN="${CODECOV_TOKEN}" -e S3_PERMANENT_ARTIFACTS_URI="${S3_PERMANENT_ARTIFACTS_URI}"
      -e COVERAGE_CACHE_FLAG="${COVERAGE_CACHE_FLAG}" -e FLAKY_PATTERNS_CONFIG="\mnt\flaky-patterns-runtime.yaml"
      ${WINBUILDIMAGE} powershell.exe -c "c:\mnt\tasks\winbuildscripts\Invoke-UnitTests.ps1
      -BuildOutOfSource 1 -CheckGoVersion 1 -InstallDeps 1 -UploadCoverage 1 -UploadTestResults
      1"
  
      '
    - If ($lastExitCode -ne "0") { exit "$lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      TEST_OUTPUT_FILE: test_output.json
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
tests_windows_secagent_x64
  tests_windows_secagent_x64:
    artifacts:
      paths:
      - $CI_PROJECT_DIR/test/new-e2e/tests/security-agent-functional/artifacts
      when: always
    needs:
    - go_deps
    - go_tools_deps
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e SIGN_WINDOWS_DD_WCS=true
      -e GOMODCACHE="c:\modcache" -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE}
      c:\mnt\tasks\winbuildscripts\secagent.bat
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
tests_windows_sysprobe_x64
  tests_windows_sysprobe_x64:
    artifacts:
      paths:
      - $CI_PROJECT_DIR/test/new-e2e/tests/sysprobe-functional/artifacts
      when: always
    needs:
    - go_deps
    - go_tools_deps
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - 'docker run --rm -m 16384M -v "$(Get-Location):c:\mnt" -e AWS_NETWORKING=true
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e SIGN_WINDOWS_DD_WCS=true
      -e GOMODCACHE="c:\modcache" -e PIP_INDEX_URL=${PIP_INDEX_URL} ${WINBUILDIMAGE}
      c:\mnt\tasks\winbuildscripts\sysprobe.bat
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: source_test
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows-installer-amd64
  windows-installer-amd64:
    after_script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_mod_tidy_check
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = 'Stop'
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 8192M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG} -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
      -e WINDOWS_BUILDER=true -e GOMODCACHE="c:\modcache" -e AWS_NETWORKING=true -e
      SIGN_WINDOWS_DD_WCS=true -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET"
      -e API_KEY_ORG2=${API_KEY_ORG2} ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-InstallerPackages.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
  
      '
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows_choco_7_x64
  windows_choco_7_x64:
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - windows_msi_and_bosh_zip_x64-a7
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: manual
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
    script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $ErrorActionPreference = "Stop"
    - if (Test-Path build-out) { remove-item -recurse -force build-out }
    - 'docker run --rm -v "$(Get-Location):c:\mnt" -e CI_PROJECT_NAME=${CI_PROJECT_NAME}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e BUCKET_BRANCH="$BUCKET_BRANCH" -e AWS_NETWORKING=true
      ${WINBUILDIMAGE} powershell.exe -C "C:\mnt\tasks\winbuildscripts\Generate-Chocolatey-Package.ps1
      -MSIDirectory c:\mnt\omnibus\pkg -Flavor $FLAVOR -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - $CopyNupkgToS3 = "$S3_CP_CMD --recursive --exclude '*' --include '*.nupkg' build-out
      $S3_RELEASE_ARTIFACTS_URI/choco/nupkg"
    - Invoke-Expression $CopyNupkgToS3
    stage: choco_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      FLAVOR: datadog-agent
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows_choco_7_x64-fips
  windows_choco_7_x64-fips:
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - windows_msi_and_bosh_zip_x64-a7-fips
    retry: 2
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      if: $BUCKET_BRANCH != "beta" && $BUCKET_BRANCH != "stable"
      when: manual
    - if: $DEPLOY_AGENT == "true" || $DDR_WORKFLOW_ID != null
    script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - $ErrorActionPreference = "Stop"
    - if (Test-Path build-out) { remove-item -recurse -force build-out }
    - 'docker run --rm -v "$(Get-Location):c:\mnt" -e CI_PROJECT_NAME=${CI_PROJECT_NAME}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e BUCKET_BRANCH="$BUCKET_BRANCH" -e AWS_NETWORKING=true
      ${WINBUILDIMAGE} powershell.exe -C "C:\mnt\tasks\winbuildscripts\Generate-Chocolatey-Package.ps1
      -MSIDirectory c:\mnt\omnibus\pkg -Flavor $FLAVOR -InstallDeps 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - $CopyNupkgToS3 = "$S3_CP_CMD --recursive --exclude '*' --include '*.nupkg' build-out
      $S3_RELEASE_ARTIFACTS_URI/choco/nupkg"
    - Invoke-Expression $CopyNupkgToS3
    stage: choco_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      FLAVOR: datadog-fips-agent
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows_msi_and_bosh_zip_x64-a7
  windows_msi_and_bosh_zip_x64-a7:
    after_script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = 'Stop'
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 24576M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG} -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
      -e OMNIBUS_TARGET=${OMNIBUS_TARGET} -e WINDOWS_BUILDER=true -e MAJOR_VERSION="7"
      -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION" -e GOMODCACHE="c:\modcache"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e TARGET_ARCH="$ARCH" -e DEBUG_CUSTOMACTION="$DEBUG_CUSTOMACTION"
      -e BUCKET_BRANCH="$BUCKET_BRANCH" -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET"
      -e S3_OMNIBUS_GIT_CACHE_BUCKET="$S3_OMNIBUS_GIT_CACHE_BUCKET" -e INTEGRATION_WHEELS_CACHE_BUCKET="$INTEGRATION_WHEELS_CACHE_BUCKET"
      -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG} -e PIP_INDEX_URL=${PIP_INDEX_URL}
      -e API_KEY_ORG2=${API_KEY_ORG2} -e OMNIBUS_GIT_CACHE_DIR=${Env:TEMP}/${CI_PIPELINE_ID}/omnibus-git-cache
      -e AGENT_FLAVOR=${AGENT_FLAVOR} -e OMNIBUS_RUBY_VERSION="${OMNIBUS_RUBY_VERSION}"
      -e PYTHONUTF8=1 ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1 -BuildUpgrade 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem omnibus\pkg
    - Invoke-Expression "$S3_CP_CMD omnibus\pkg\version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    timeout: 2h
    variables:
      ARCH: x64
      OMNIBUS_TARGET: main
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows_msi_and_bosh_zip_x64-a7-fips
  windows_msi_and_bosh_zip_x64-a7-fips:
    after_script:
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = 'Stop'
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 24576M -v "$(Get-Location):c:\mnt" -e CI_JOB_ID=${CI_JOB_ID}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG} -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME}
      -e OMNIBUS_TARGET=${OMNIBUS_TARGET} -e WINDOWS_BUILDER=true -e MAJOR_VERSION="7"
      -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION" -e GOMODCACHE="c:\modcache"
      -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true -e TARGET_ARCH="$ARCH" -e DEBUG_CUSTOMACTION="$DEBUG_CUSTOMACTION"
      -e BUCKET_BRANCH="$BUCKET_BRANCH" -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET"
      -e S3_OMNIBUS_GIT_CACHE_BUCKET="$S3_OMNIBUS_GIT_CACHE_BUCKET" -e INTEGRATION_WHEELS_CACHE_BUCKET="$INTEGRATION_WHEELS_CACHE_BUCKET"
      -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG} -e PIP_INDEX_URL=${PIP_INDEX_URL}
      -e API_KEY_ORG2=${API_KEY_ORG2} -e OMNIBUS_GIT_CACHE_DIR=${Env:TEMP}/${CI_PIPELINE_ID}/omnibus-git-cache
      -e AGENT_FLAVOR=${AGENT_FLAVOR} -e OMNIBUS_RUBY_VERSION="${OMNIBUS_RUBY_VERSION}"
      -e PYTHONUTF8=1 ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-AgentPackages.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1 -BuildUpgrade 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem omnibus\pkg
    - Invoke-Expression "$S3_CP_CMD omnibus\pkg\version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    timeout: 2h
    variables:
      AGENT_FLAVOR: fips
      ARCH: x64
      OMNIBUS_TARGET: main
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}
windows_zip_agent_binaries_x64-a7
  windows_zip_agent_binaries_x64-a7:
    artifacts:
      expire_in: 2 weeks
      paths:
      - omnibus/pkg
    needs:
    - go_mod_tidy_check
    - go_deps
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - when: on_success
    script:
    - $ErrorActionPreference = "Stop"
    - $_instance_id = (iwr  -UseBasicParsing http://169.254.169.254/latest/meta-data/instance-id).content
      ; Write-Host "Running on instance $($_instance_id)"
    - if (Test-Path omnibus\pkg) { remove-item -recurse -force omnibus\pkg }
    - mkdir omnibus\pkg
    - 'docker run --rm -m 8192M -v "$(Get-Location):c:\mnt" -e CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH}
      -e CI_PIPELINE_ID=${CI_PIPELINE_ID} -e CI_PROJECT_NAME=${CI_PROJECT_NAME} -e CI_JOB_NAME_SLUG=${CI_JOB_NAME_SLUG}
      -e CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} -e OMNIBUS_TARGET=${OMNIBUS_TARGET}
      -e WINDOWS_BUILDER=true -e MAJOR_VERSION="7" -e INTEGRATIONS_CORE_VERSION="$INTEGRATIONS_CORE_VERSION"
      -e GOMODCACHE="c:\modcache" -e AWS_NETWORKING=true -e SIGN_WINDOWS_DD_WCS=true
      -e BUCKET_BRANCH="$BUCKET_BRANCH" -e INTEGRATION_WHEELS_CACHE_BUCKET="$INTEGRATION_WHEELS_CACHE_BUCKET"
      -e S3_OMNIBUS_CACHE_BUCKET="$S3_OMNIBUS_CACHE_BUCKET" -e USE_S3_CACHING="$USE_S3_CACHING"
      -e BUNDLE_MIRROR__RUBYGEMS__ORG=${BUNDLE_MIRROR__RUBYGEMS__ORG} -e PIP_INDEX_URL=${PIP_INDEX_URL}
      -e API_KEY_ORG2=${API_KEY_ORG2} ${WINBUILDIMAGE} powershell -C "c:\mnt\tasks\winbuildscripts\Build-OmnibusTarget.ps1
      -BuildOutOfSource 1 -InstallDeps 1 -CheckGoVersion 1"
  
      '
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    - get-childitem omnibus\pkg
    - Invoke-Expression "$S3_CP_CMD omnibus\pkg\version-manifest.json $S3_SBOM_STORAGE_URI/$CI_JOB_NAME/version-manifest.json"
    - If ($lastExitCode -ne "0") { throw "Previous command returned $lastExitCode" }
    stage: package_build
    tags:
-   - windows-v2:2022
+   - windows-test-v2:2022
?             +++++
    variables:
      ARCH: x64
      OMNIBUS_TARGET: agent-binaries
      WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${CI_IMAGE_WIN_LTSC2022_X64_SUFFIX}:${CI_IMAGE_WIN_LTSC2022_X64}

Changes Summary

Removed Modified Added Renamed
0 31 0 0

ℹ️ Diff available in the job log.

Copy link

cit-pr-commenter bot commented Jun 12, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 1ce421ac-139d-4db8-af6a-9bbd65771f00

Baseline: ca0ab98
Comparison: 1f5a5ff
Diff

Optimization Goals: ❌ Regression(s) detected

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +6.01 [+2.85, +9.17] 1 Logs

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
docker_containers_cpu % cpu utilization +6.01 [+2.85, +9.17] 1 Logs
file_tree memory utilization +0.91 [+0.75, +1.07] 1 Logs
quality_gate_idle_all_features memory utilization +0.60 [+0.51, +0.69] 1 Logs bounds checks dashboard
tcp_syslog_to_blackhole ingress throughput +0.42 [+0.36, +0.48] 1 Logs
quality_gate_idle memory utilization +0.26 [+0.18, +0.33] 1 Logs bounds checks dashboard
file_to_blackhole_500ms_latency egress throughput +0.14 [-0.44, +0.73] 1 Logs
file_to_blackhole_300ms_latency egress throughput +0.05 [-0.54, +0.63] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.04 [-0.56, +0.65] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.00 [-0.27, +0.27] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.01] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.00 [-0.62, +0.61] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput -0.01 [-0.57, +0.56] 1 Logs
otlp_ingest_logs memory utilization -0.03 [-0.15, +0.10] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.04 [-0.28, +0.19] 1 Logs
otlp_ingest_metrics memory utilization -0.05 [-0.21, +0.11] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.06 [-0.60, +0.49] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.07 [-0.63, +0.50] 1 Logs
docker_containers_memory memory utilization -0.07 [-0.13, -0.01] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.16 [-1.00, +0.67] 1 Logs
ddot_logs memory utilization -0.20 [-0.35, -0.06] 1 Logs
ddot_metrics memory utilization -0.47 [-0.58, -0.35] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.49 [-0.53, -0.44] 1 Logs
quality_gate_logs % cpu utilization -2.05 [-4.75, +0.65] 1 Logs bounds checks dashboard

Bounds Checks: ✅ Passed

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

Explanation

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

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

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

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

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

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

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

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

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle_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 intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • 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.

@agent-platform-auto-pr
Copy link
Contributor

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

Static quality checks

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

Successful checks

Info

Quality gate Delta On disk size (MiB) Delta On wire size (MiB)
agent_deb_amd64 $${0}$$ $${696.33}$$ < $${752.99}$$ $${+0}$$ $${176.07}$$ < $${187.44}$$
agent_deb_amd64_fips $${0}$$ $${694.55}$$ < $${751.36}$$ $${-0.01}$$ $${175.51}$$ < $${187.06}$$
agent_heroku_amd64 $${0}$$ $${358.63}$$ < $${369.68}$$ $${-0}$$ $${96.52}$$ < $${99.55}$$
agent_msi $${0}$$ $${958.51}$$ < $${987.01}$$ $${-0.02}$$ $${146.24}$$ < $${150.72}$$
agent_rpm_amd64 $${0}$$ $${696.32}$$ < $${752.98}$$ $${+0.03}$$ $${177.63}$$ < $${190.03}$$
agent_rpm_amd64_fips $${0}$$ $${694.54}$$ < $${751.35}$$ $${+0.01}$$ $${177.44}$$ < $${189.81}$$
agent_rpm_arm64 $${0}$$ $${686.33}$$ < $${739.42}$$ $${+0.01}$$ $${161.05}$$ < $${171.23}$$
agent_rpm_arm64_fips $${0}$$ $${684.68}$$ < $${737.91}$$ $${-0.02}$$ $${160.17}$$ < $${170.22}$$
agent_suse_amd64 $${0}$$ $${696.32}$$ < $${752.98}$$ $${+0.03}$$ $${177.63}$$ < $${190.03}$$
agent_suse_amd64_fips $${0}$$ $${694.54}$$ < $${751.35}$$ $${+0.01}$$ $${177.44}$$ < $${189.81}$$
agent_suse_arm64 $${0}$$ $${686.33}$$ < $${739.42}$$ $${+0.01}$$ $${161.05}$$ < $${171.23}$$
agent_suse_arm64_fips $${0}$$ $${684.68}$$ < $${737.91}$$ $${-0.02}$$ $${160.17}$$ < $${170.22}$$
docker_agent_amd64 $${-0}$$ $${780.12}$$ < $${849.39}$$ $${+0}$$ $${268.66}$$ < $${288.34}$$
docker_agent_arm64 $${+0}$$ $${793.58}$$ < $${858.97}$$ $${+0.01}$$ $${256.04}$$ < $${274.36}$$
docker_agent_jmx_amd64 $${-0}$$ $${971.31}$$ < $${1040.59}$$ $${-0.03}$$ $${337.61}$$ < $${357.3}$$
docker_agent_jmx_arm64 $${-0}$$ $${973.37}$$ < $${1038.77}$$ $${-0.02}$$ $${320.98}$$ < $${339.32}$$
docker_agent_windows1809 $${+0}$$ $${1486.65}$$ < $${1557.19}$$ $${+0.02}$$ $${487.91}$$ < $${507.33}$$
docker_agent_windows1809_core $${+0}$$ $${6216.61}$$ < $${6287.46}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows1809_core_jmx $${-22.26}$$ $${6338.18}$$ < $${6409.04}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows1809_jmx $${+0.06}$$ $${1608.34}$$ < $${1679.14}$$ $${-0.22}$$ $${529.95}$$ < $${550.27}$$
docker_agent_windows2022 $${+0.09}$$ $${1505.77}$$ < $${1576.85}$$ $${+0.02}$$ $${500.66}$$ < $${520.76}$$
docker_agent_windows2022_core $${-0.22}$$ $${6189.73}$$ < $${6260.53}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows2022_core_jmx $${-0.28}$$ $${6311.31}$$ < $${6382.17}$$ $${0}$$ $${2048.0}$$ < $${2067.76}$$
docker_agent_windows2022_jmx $${-0.29}$$ $${1627.35}$$ < $${1698.2}$$ $${+0.01}$$ $${542.93}$$ < $${562.99}$$
docker_cluster_agent_amd64 $${-0}$$ $${212.81}$$ < $${259.73}$$ $${-0}$$ $${72.36}$$ < $${103.68}$$
docker_cluster_agent_arm64 $${0}$$ $${228.68}$$ < $${274.24}$$ $${+0}$$ $${68.64}$$ < $${98.45}$$
docker_cws_instrumentation_amd64 $${0}$$ $${7.08}$$ < $${7.12}$$ $${+0}$$ $${2.95}$$ < $${3.29}$$
docker_cws_instrumentation_arm64 $${0}$$ $${6.69}$$ < $${6.92}$$ $${+0}$$ $${2.7}$$ < $${3.07}$$
docker_dogstatsd_amd64 $${0}$$ $${39.22}$$ < $${39.57}$$ $${-0}$$ $${15.12}$$ < $${15.76}$$
docker_dogstatsd_arm64 $${0}$$ $${37.88}$$ < $${38.2}$$ $${-0}$$ $${14.53}$$ < $${14.83}$$
dogstatsd_deb_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${+0}$$ $${8.0}$$ < $${8.97}$$
dogstatsd_deb_arm64 $${0}$$ $${29.02}$$ < $${30.08}$$ $${+0}$$ $${6.94}$$ < $${7.92}$$
dogstatsd_rpm_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${-0}$$ $${8.01}$$ < $${8.98}$$
dogstatsd_suse_amd64 $${0}$$ $${30.44}$$ < $${31.52}$$ $${-0}$$ $${8.01}$$ < $${8.98}$$
iot_agent_deb_amd64 $${0}$$ $${50.4}$$ < $${60.17}$$ $${+0}$$ $${12.83}$$ < $${15.82}$$
iot_agent_deb_arm64 $${0}$$ $${47.87}$$ < $${56.94}$$ $${-0}$$ $${11.13}$$ < $${13.86}$$
iot_agent_deb_armhf $${0}$$ $${47.44}$$ < $${56.41}$$ $${-0}$$ $${11.2}$$ < $${13.86}$$
iot_agent_rpm_amd64 $${0}$$ $${50.4}$$ < $${60.18}$$ $${-0}$$ $${12.85}$$ < $${15.84}$$
iot_agent_rpm_arm64 $${0}$$ $${47.87}$$ < $${56.94}$$ $${+0}$$ $${11.15}$$ < $${13.76}$$
iot_agent_suse_amd64 $${0}$$ $${50.4}$$ < $${60.18}$$ $${-0}$$ $${12.85}$$ < $${15.84}$$

@jorgetomtz
Copy link
Contributor Author

/trigger-ci

@dd-devflow
Copy link

dd-devflow bot commented Jun 12, 2025

View all feedbacks in Devflow UI.

2025-06-12 20:51:40 UTC ℹ️ Start processing command /trigger-ci
If you need support, contact us on Slack #devflow!


2025-06-12 20:54:43 UTC 🚨 Devflow

Post "https://gitlab.ddbuild.io/api/v4/projects/DataDog%2Fdatadog-agent/pipeline": net/http: request canceled (Client.Timeout exceeded while awaiting headers)

Details
child workflow execution error (type: devflow.Devflow_TriggerCiFromPr, workflowID: 08c7456c-ed4e-4909-b385-0c3aab189a69_26, runID: 5f1dc175-0566-4327-aea3-7a0545b46515, initiatedEventID: 26, startedEventID: 27): child workflow execution error (type: devflow.Devflow_TriggerCi, workflowID: 5f1dc175-0566-4327-aea3-7a0545b46515_14, runID: f85efd2f-ea8a-410d-ad82-1f64a2dc08b1, initiatedEventID: 14, startedEventID: 15): activity error (type: gitlab.GitlabService_CreatePipeline, scheduledEventID: 26, startedEventID: 27, identity: ): activity ScheduleToClose timeout (type: ScheduleToClose): Post "https://gitlab.ddbuild.io/api/v4/projects/DataDog%2Fdatadog-agent/pipeline": net/http: request canceled (Client.Timeout exceeded while awaiting headers) (type: Error, retryable: true): net/http: request canceled (Client.Timeout exceeded while awaiting headers) (type: timeoutError, retryable: true)

If you need support, contact us on Slack #devflow with those details!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
short review PR is simple enough to be reviewed quickly team/agent-devx
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant