Deploy Fleet Automation installation script in Agent Release Management #32860
+22
−53
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julien-lebot
added
changelog/no-changelog
qa/no-code-change
Gitlab CI Configuration ChangesModified Jobsstages (configuration) stages:
- .pre
- setup
- maintenance_jobs
- deps_build
- deps_fetch
- lint
- source_test
- source_test_stats
- software_composition_analysis
- binary_build
- package_deps_build
- kernel_matrix_testing_prepare
- kernel_matrix_testing_system_probe
- kernel_matrix_testing_security_agent
- kernel_matrix_testing_cleanup
- integration_test
- benchmarks
- package_build
- packaging
- pkg_metrics
- container_build
- container_scan
- check_deploy
- dev_container_deploy
- deploy_containers
- deploy_packages
- deploy_cws_instrumentation
- deploy_dca
- - choco_and_install_script_build
+ - choco_build
- trigger_release
- install_script_deploy
- internal_image_deploy
- e2e_deploy
- install_script_testing
- e2e_pre_test
- e2e_init
- e2e
- e2e_cleanup
- e2e_k8s
- e2e_install_packages
- functional_test
- junit_upload
- internal_kubernetes_deploy
- post_rc_build
- check_merge
- notify
- .post.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_and_install_script_build
+ stage: choco_build
tags:
- runner:windows-docker
- windowsversion:2022
variables:
ARCH: x64
WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${DATADOG_AGENT_WINBUILDIMAGES}deploy_installer_packages_windows-x64 deploy_installer_packages_windows-x64:
before_script:
- ls $OMNIBUS_PACKAGE_DIR
image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
needs:
- windows-installer-amd64
+ - powershell_script_signing
rules:
- if: $DEPLOY_INSTALLER == "true" || $DDR_WORKFLOW_ID != null
script:
- $S3_CP_CMD --recursive --exclude "*" --include "datadog-installer-*-1-x86_64.msi"
--include "datadog-installer-*-1-x86_64.debug.zip" --include "datadog-installer-*-1-x86_64.zip"
--include "datadog-installer-*-1-x86_64.exe" $OMNIBUS_PACKAGE_DIR $S3_RELEASE_INSTALLER_ARTIFACTS_URI/msi/x86_64/
+ - $S3_CP_CMD $WINDOWS_POWERSHELL_DIR/Install-Datadog.ps1 $S3_RELEASE_INSTALLER_ARTIFACTS_URI
stage: deploy_packages
tags:
- arch:amd64powershell_script_signing powershell_script_signing:
artifacts:
expire_in: 2 weeks
paths:
- $WINDOWS_POWERSHELL_DIR
needs: []
rules:
+ - if: $DEPLOY_INSTALLER == "true" || $DDR_WORKFLOW_ID != null
- - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
- when: never
- - allow_failure: true
- when: manual
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: choco_and_install_script_build
+ stage: deploy_packages
tags:
- runner:windows-docker
- windowsversion:2022
variables:
ARCH: x64
WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${DATADOG_AGENT_WINBUILDIMAGES}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_and_install_script_build
+ stage: choco_build
tags:
- runner:windows-docker
- windowsversion:2022
variables:
ARCH: x64
FLAVOR: datadog-agent
WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${DATADOG_AGENT_WINBUILDIMAGES}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_and_install_script_build
+ stage: choco_build
tags:
- runner:windows-docker
- windowsversion:2022
variables:
ARCH: x64
FLAVOR: datadog-fips-agent
WINBUILDIMAGE: registry.ddbuild.io/ci/datadog-agent-buildimages/windows_ltsc2022_${ARCH}${DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${DATADOG_AGENT_WINBUILDIMAGES}Removed Jobs
Changes Summary
ℹ️ Diff available in the job log. |
|
[Fast Unit Tests Report] On pipeline 52685707 (CI Visibility). The following jobs did not run any unit tests: Jobs:
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 |
Uncompressed package size comparisonComparison with ancestor Diff per package
Decision✅ Passed |
Regression DetectorRegression Detector ResultsMetrics dashboard Baseline: f8433ed Optimization Goals: ✅ No significant changes detected
|
| perf | experiment | goal | Δ mean % | Δ mean % CI | trials | links |
|---|---|---|---|---|---|---|
| ➖ | tcp_syslog_to_blackhole | ingress throughput | +1.33 | [+1.26, +1.39] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api_cpu | % cpu utilization | +0.79 | [+0.11, +1.47] | 1 | Logs |
| ➖ | file_tree | memory utilization | +0.60 | [+0.47, +0.74] | 1 | Logs |
| ➖ | quality_gate_idle_all_features | memory utilization | +0.41 | [+0.32, +0.50] | 1 | Logs bounds checks dashboard |
| ➖ | quality_gate_idle | memory utilization | +0.35 | [+0.32, +0.39] | 1 | Logs bounds checks dashboard |
| ➖ | file_to_blackhole_1000ms_latency_linear_load | egress throughput | +0.14 | [-0.33, +0.61] | 1 | Logs |
| ➖ | file_to_blackhole_0ms_latency_http2 | egress throughput | +0.04 | [-0.80, +0.88] | 1 | Logs |
| ➖ | file_to_blackhole_0ms_latency_http1 | egress throughput | +0.03 | [-0.89, +0.94] | 1 | Logs |
| ➖ | file_to_blackhole_300ms_latency | egress throughput | +0.02 | [-0.62, +0.65] | 1 | Logs |
| ➖ | uds_dogstatsd_to_api | ingress throughput | +0.01 | [-0.11, +0.13] | 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.02 | [-0.92, +0.88] | 1 | Logs |
| ➖ | file_to_blackhole_100ms_latency | egress throughput | -0.05 | [-0.79, +0.69] | 1 | Logs |
| ➖ | file_to_blackhole_500ms_latency | egress throughput | -0.07 | [-0.83, +0.70] | 1 | Logs |
| ➖ | file_to_blackhole_1000ms_latency | egress throughput | -0.18 | [-0.95, +0.59] | 1 | Logs |
| ➖ | quality_gate_logs | % cpu utilization | -1.87 | [-5.06, +1.33] | 1 | Logs |
Bounds Checks: ✅ Passed
| perf | experiment | bounds_check_name | replicates_passed | links |
|---|---|---|---|---|
| ✅ | 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 | memory_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_idle_all_features | memory_usage | 10/10 | bounds checks dashboard |
| ✅ | quality_gate_logs | lost_bytes | 10/10 | |
| ✅ | quality_gate_logs | memory_usage | 10/10 |
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:
-
Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.
-
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.
-
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_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
- quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
- quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
clarkb7
approved these changes
Jan 10, 2025
Co-authored-by: Branden Clark <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR removes the jobs that were deploying the PowerShell install script for Fleet Automation in the Agent pipeline in favor of deploying it in the Agent release management repository.
Motivation
More reliable deployment for the Fleet Automation install script for Windows.
Describe how you validated your changes
Possible Drawbacks / Trade-offs
Additional Notes