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

remove unused choco related files #32310

Merged
merged 3 commits into from
Dec 19, 2024
Merged

remove unused choco related files #32310

merged 3 commits into from
Dec 19, 2024

Conversation

sabrina-datadog
Copy link
Contributor

@sabrina-datadog sabrina-datadog commented Dec 17, 2024

What does this PR do?

Remove the unused chocolatey jobs:

  • offline chocolate build job (windows_choco_offline_7_x64)
  • choco deploy job (publish_choco_7_x64)

Rename and reorganize the file structure without "online" since there is no more offline.

Motivation

After chocolatey has been automated, there is no need for the manual components. (BARX-684)

Describe how you validated your changes

  1. checked that the offline job is no longer in the choco build stage and the choco publish job isn't in the install_script_deploy stage
image
  1. manually ran the choco build jobs to ensure they still work

Possible Drawbacks / Trade-offs

Additional Notes

@github-actions github-actions bot added long review PR is complex, plan time to review it team/windows-agent labels Dec 17, 2024
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Dec 17, 2024

Gitlab CI Configuration Changes

Modified Jobs

stages (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
  - trigger_release
- - choco_and_install_script_deploy
?   ----------
+ - 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
powershell_script_deploy
  powershell_script_deploy:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - powershell_script_signing
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - ls $WINDOWS_POWERSHELL_DIR
    - $S3_CP_CMD $WINDOWS_POWERSHELL_DIR/Install-Datadog.ps1 s3://dd-agent-mstesting/Install-Datadog.ps1
      --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=3a6e02b08553fd157ae3fb918945dd1eaae5a1aa818940381ef07a430cf25732
-   stage: choco_and_install_script_deploy
?          ----------
+   stage: install_script_deploy
    tags:
    - arch:amd64
windows_bootstrapper_deploy
  windows_bootstrapper_deploy:
    image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
    needs:
    - windows-installer-amd64
    rules:
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - ls $OMNIBUS_PACKAGE_DIR
    - $S3_CP_CMD $OMNIBUS_PACKAGE_DIR/datadog-installer-*-1-x86_64.exe s3://dd-agent-mstesting/datadog-installer-x86_64.exe
      --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers full=id=3a6e02b08553fd157ae3fb918945dd1eaae5a1aa818940381ef07a430cf25732
-   stage: choco_and_install_script_deploy
?          ----------
+   stage: install_script_deploy
    tags:
    - arch:amd64

Added Jobs

.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
    registry.ddbuild.io/ci/datadog-agent-buildimages/windows_1809_${ARCH}${Env:DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
    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
  tags:
  - runner:windows-docker
  - windowsversion:1809
  variables:
    ARCH: 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
    registry.ddbuild.io/ci/datadog-agent-buildimages/windows_1809_${ARCH}${Env:DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
    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
  tags:
  - runner:windows-docker
  - windowsversion:1809
  variables:
    ARCH: x64
    FLAVOR: datadog-agent
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
    registry.ddbuild.io/ci/datadog-agent-buildimages/windows_1809_${ARCH}${Env:DATADOG_AGENT_WINBUILDIMAGES_SUFFIX}:${Env:DATADOG_AGENT_WINBUILDIMAGES}
    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
  tags:
  - runner:windows-docker
  - windowsversion:1809
  variables:
    ARCH: x64
    FLAVOR: datadog-fips-agent

Removed Jobs

  • .windows_choco_online_7_x64
  • publish_choco_7_x64
  • windows_choco_offline_7_x64
  • windows_choco_online_7_x64
  • windows_choco_online_7_x64-fips

Changes Summary

Removed Modified Added Renamed
5 3 3 0

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Dec 17, 2024

[Fast Unit Tests Report]

On pipeline 51503054 (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

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Dec 17, 2024

Uncompressed package size comparison

Comparison with ancestor 898efd46fa0034654361c3ed860826bcfde1fcbd

Diff per package
package diff status size ancestor threshold
datadog-agent-aarch64-rpm 0.02MB ⚠️ 977.73MB 977.71MB 140.00MB
datadog-agent-arm64-deb 0.01MB ⚠️ 968.51MB 968.49MB 140.00MB
datadog-heroku-agent-amd64-deb 0.00MB ⚠️ 504.96MB 504.96MB 70.00MB
datadog-dogstatsd-amd64-deb 0.00MB 78.53MB 78.53MB 10.00MB
datadog-dogstatsd-x86_64-rpm 0.00MB 78.61MB 78.61MB 10.00MB
datadog-dogstatsd-x86_64-suse 0.00MB 78.61MB 78.61MB 10.00MB
datadog-dogstatsd-arm64-deb 0.00MB 55.75MB 55.75MB 10.00MB
datadog-iot-agent-amd64-deb 0.00MB 113.26MB 113.26MB 10.00MB
datadog-iot-agent-x86_64-rpm 0.00MB 113.33MB 113.33MB 10.00MB
datadog-iot-agent-x86_64-suse 0.00MB 113.33MB 113.33MB 10.00MB
datadog-iot-agent-arm64-deb 0.00MB 108.72MB 108.72MB 10.00MB
datadog-iot-agent-aarch64-rpm 0.00MB 108.79MB 108.79MB 10.00MB
datadog-agent-x86_64-rpm -0.00MB 1241.93MB 1241.94MB 140.00MB
datadog-agent-x86_64-suse -0.00MB 1241.93MB 1241.94MB 140.00MB
datadog-agent-amd64-deb -0.00MB 1232.70MB 1232.70MB 140.00MB

Decision

⚠️ Warning

Copy link

cit-pr-commenter bot commented Dec 17, 2024

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 78d29e5e-806b-4da7-bd83-0301059645e4

Baseline: 898efd4
Comparison: 04139de
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +0.71 [-2.22, +3.63] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.43 [+0.36, +0.50] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization +0.38 [-0.34, +1.11] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput +0.30 [-0.16, +0.76] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.24 [-0.51, +0.99] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.09 [-0.71, +0.88] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.06 [-0.70, +0.82] 1 Logs
file_to_blackhole_0ms_latency egress throughput +0.04 [-0.86, +0.94] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.02 [-0.87, +0.91] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.01 [-0.09, +0.11] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.01, +0.01] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.01 [-0.88, +0.87] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.04 [-0.67, +0.59] 1 Logs
quality_gate_idle memory utilization -0.11 [-0.15, -0.07] 1 Logs bounds checks dashboard
file_tree memory utilization -0.57 [-0.69, -0.46] 1 Logs
quality_gate_idle_all_features memory utilization -0.97 [-1.08, -0.86] 1 Logs bounds checks dashboard
otel_to_otel_logs ingress throughput -0.98 [-1.65, -0.31] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
file_to_blackhole_0ms_latency lost_bytes 9/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:

  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_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, bounds check memory_usage: 10/10 replicas passed. Gate passed.

@sabrina-datadog sabrina-datadog marked this pull request as ready for review December 17, 2024 21:45
@sabrina-datadog sabrina-datadog requested review from a team as code owners December 17, 2024 21:45
@sabrina-datadog
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Dec 19, 2024

Devflow running: /merge

View all feedbacks in Devflow UI.


2024-12-19 00:11:59 UTC ℹ️ MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.


2024-12-19 00:21:12 UTC ℹ️ MergeQueue: merge request added to the queue

The median merge time in main is 27m.


2024-12-19 00:43:16 UTC ℹ️ MergeQueue: This merge request was merged

@sabrina-datadog sabrina-datadog added qa/no-code-change No code change in Agent code requiring validation changelog/no-changelog labels Dec 19, 2024
@dd-mergequeue dd-mergequeue bot merged commit 8ccce41 into main Dec 19, 2024
250 of 252 checks passed
@dd-mergequeue dd-mergequeue bot deleted the sabrina/cleanup-choco branch December 19, 2024 00:43
@github-actions github-actions bot added this to the 7.62.0 milestone Dec 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog long review PR is complex, plan time to review it qa/no-code-change No code change in Agent code requiring validation team/windows-agent
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants