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

[Fleet Automation] Add a flag to force install package #33600

Merged
merged 12 commits into from
Feb 5, 2025

Conversation

julien-lebot
Copy link
Contributor

@julien-lebot julien-lebot commented Jan 30, 2025

What does this PR do?

This PR adds a flag that allows ignoring if a package is installed and the version matches in the InstallPackage command.

Motivation

https://datadoghq.atlassian.net/browse/WINA-1170
https://datadoghq.atlassian.net/browse/WINA-1016 (because this PR adds some E2E tests for the install-script)

Describe how you validated your changes

Main QA:

E2E tests.

Manual QA:

Run install script to install 7.56. Remote update to 7.58.
Re-run install script with 7.56. Agent version should be 7.56.

Possible Drawbacks / Trade-offs

Additional Notes

@julien-lebot julien-lebot added os/windows changelog/no-changelog team/windows-agent qa/done QA done before merge and regressions are covered by tests labels Jan 30, 2025
@julien-lebot julien-lebot added this to the 7.55.0 milestone Jan 30, 2025
@julien-lebot julien-lebot requested review from a team as code owners January 30, 2025 23:32
@github-actions github-actions bot added the long review PR is complex, plan time to review it label Jan 30, 2025
Copy link
Contributor

@clarkb7 clarkb7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm with minor comments/questions

.gitlab/deploy_packages/e2e.yml Outdated Show resolved Hide resolved
cmd/installer/subcommands/installer/command.go Outdated Show resolved Hide resolved
@@ -49,7 +49,7 @@ type Installer interface {
ConfigState(pkg string) (repository.State, error)
ConfigStates() (map[string]repository.State, error)

Install(ctx context.Context, url string, args []string) error
Install(ctx context.Context, url string, args []string, force bool) error
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit/style: I generally prefer to avoid bool options since their purpose isn't clear at the call site. Would use a separate function instead.

Suggested change
Install(ctx context.Context, url string, args []string, force bool) error
Install(ctx context.Context, url string, args []string) error
ForceInstall(ctx context.Context, url string, args []string) error

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pkg/fleet/installer/installer_test.go Outdated Show resolved Hide resolved
@@ -38,7 +38,7 @@ func install(ctx context.Context, env *env.Env, url string, experiment bool) err
if experiment {
return cmd.InstallExperiment(ctx, url)
}
return cmd.Install(ctx, url, nil)
return cmd.Install(ctx, url, nil, false)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is --force only applicable to Windows? If so we should say so in the help or only add the option on Windows.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should work across platforms, but I'll let the Linux folks decide if they want this behavior or not.

pkg/fleet/internal/exec/installer_exec.go Outdated Show resolved Hide resolved
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072;
iex ((New-Object System.Net.WebClient).DownloadString('https://s3.amazonaws.com/dd-agent-mstesting/Install-Datadog.ps1'));`
iex ((New-Object System.Net.WebClient).DownloadString('https://installtesting.datad0g.com/%s/scripts/Install-Datadog.ps1'))`, d.env.Environment.PipelineID())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: if taking earlier suggestion, otherwise ignore

Suggested change
iex ((New-Object System.Net.WebClient).DownloadString('https://installtesting.datad0g.com/%s/scripts/Install-Datadog.ps1'))`, d.env.Environment.PipelineID())
iex ((New-Object System.Net.WebClient).DownloadString('https://installtesting.datad0g.com/pipeline-%s/scripts/Install-Datadog.ps1'))`, d.env.Environment.PipelineID())

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clarkb7 clarkb7 removed this from the 7.55.0 milestone Jan 31, 2025
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Jan 31, 2025

Gitlab CI Configuration Changes

Modified Jobs

deploy_installer_packages_windows-x64
  deploy_installer_packages_windows-x64:
    before_script:
    - ls $OMNIBUS_PACKAGE_DIR
+   - ls $WINDOWS_POWERSHELL_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/scripts/Install-Datadog.ps1
    stage: deploy_packages
    tags:
    - arch:amd64
new-e2e-installer-script
  new-e2e-installer-script:
    after_script:
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    artifacts:
      expire_in: 2 weeks
      paths:
      - $E2E_OUTPUT_DIR
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
      when: always
    before_script:
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_e2e.tar.xz
    - mkdir -p ~/.aws
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E profile >> ~/.aws/config
      || exit $?
    - export AWS_PROFILE=agent-qa-ci
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AWS_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AWS_PRIVATE_KEY_PATH && chmod 600 $E2E_AWS_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_AWS_PRIVATE_KEY_PATH || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AZURE_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AZURE_PRIVATE_KEY_PATH && chmod 600 $E2E_AZURE_PRIVATE_KEY_PATH &&
      $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_key_rsa > $E2E_AZURE_PRIVATE_KEY_PATH
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_GCP_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_GCP_PRIVATE_KEY_PATH && chmod 600 $E2E_GCP_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_GCP_PRIVATE_KEY_PATH || exit $?
    - pulumi login "s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
    - ARM_CLIENT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE client_id)
      || exit $?; export ARM_CLIENT_ID
    - ARM_CLIENT_SECRET=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE token)
      || exit $?; export ARM_CLIENT_SECRET
    - ARM_TENANT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE tenant_id)
      || exit $?; export ARM_TENANT_ID
    - ARM_SUBSCRIPTION_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE subscription_id)
      || exit $?; export ARM_SUBSCRIPTION_ID
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_GCP credentials_json > ~/gcp-credentials.json
      || exit $?
    - export GOOGLE_APPLICATION_CREDENTIALS=~/gcp-credentials.json
    - inv -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    image: registry.ddbuild.io/ci/test-infra-definitions/runner$TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX:$TEST_INFRA_DEFINITIONS_BUILDIMAGES
    needs:
    - go_e2e_deps
    - deploy_deb_testing-a7_arm64
    - deploy_deb_testing-a7_x64
    - deploy_rpm_testing-a7_arm64
    - deploy_rpm_testing-a7_x64
    - deploy_suse_rpm_testing_arm64-a7
    - deploy_suse_rpm_testing_x64-a7
    - deploy_installer_oci
-   - qa_installer_script
+   - qa_installer_script_linux
?                        ++++++
    rules:
    - if: $RUN_E2E_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $RUN_E2E_TESTS == "on"
      when: on_success
    - if: $CI_COMMIT_BRANCH == "main"
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      when: on_success
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      when: on_success
    - changes:
        compare_to: main
        paths:
        - .gitlab/e2e/e2e.yml
        - test/new-e2e/pkg/**/*
        - test/new-e2e/go.mod
        - flakes.yaml
    - changes:
        compare_to: main
        paths:
        - .gitlab/**/*
        - omnibus/config/**/*
        - pkg/fleet/**/*
        - cmd/installer/**/*
        - test/new-e2e/tests/installer/**/*
        - tasks/installer.py
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - inv -e new-e2e-tests.run --targets $TARGETS -c ddagent:imagePullRegistry=669783387624.dkr.ecr.us-east-1.amazonaws.com
      -c ddagent:imagePullUsername=AWS -c ddagent:imagePullPassword=$(aws ecr get-login-password)
      --junit-tar junit-${CI_JOB_ID}.tgz ${EXTRA_PARAMS} --test-washer --logs-folder=$E2E_OUTPUT_DIR/logs
      --logs-post-processing --logs-post-processing-test-depth=$E2E_LOGS_PROCESSING_TEST_DEPTH
    stage: e2e
    tags:
    - arch:amd64
    variables:
      E2E_AWS_PRIVATE_KEY_PATH: /tmp/agent-qa-aws-ssh-key
      E2E_AWS_PUBLIC_KEY_PATH: /tmp/agent-qa-aws-ssh-key.pub
      E2E_AZURE_PRIVATE_KEY_PATH: /tmp/agent-qa-azure-ssh-key
      E2E_AZURE_PUBLIC_KEY_PATH: /tmp/agent-qa-azure-ssh-key.pub
      E2E_COMMIT_SHA: $CI_COMMIT_SHORT_SHA
      E2E_GCP_PRIVATE_KEY_PATH: /tmp/agent-qa-gcp-ssh-key
      E2E_GCP_PUBLIC_KEY_PATH: /tmp/agent-qa-gcp-ssh-key.pub
      E2E_KEY_PAIR_NAME: datadog-agent-ci-rsa
      E2E_LOGS_PROCESSING_TEST_DEPTH: 1
      E2E_OUTPUT_DIR: $CI_PROJECT_DIR/e2e-output
      E2E_PIPELINE_ID: $CI_PIPELINE_ID
      EXTERNAL_LINKS_PATH: external_links_$CI_JOB_ID.json
      FLEET_INSTALL_METHOD: install_script
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 16Gi
      KUBERNETES_MEMORY_REQUEST: 12Gi
      SHOULD_RUN_IN_FLAKES_FINDER: 'true'
      TARGETS: ./tests/installer/script
      TEAM: fleet
new-e2e-installer-windows
  new-e2e-installer-windows:
    after_script:
    - $CI_PROJECT_DIR/tools/ci/junit_upload.sh
    artifacts:
      expire_in: 2 weeks
      paths:
      - $E2E_OUTPUT_DIR
      - junit-*.tgz
      reports:
        annotations:
        - $EXTERNAL_LINKS_PATH
      when: always
    before_script:
    - CURRENT_AGENT_VERSION=$(invoke agent.version) || exit $?; export CURRENT_AGENT_VERSION
    - export STABLE_AGENT_VERSION_PACKAGE=$(curl --retry 10 --retry-all-errors -sS https://hub.docker.com/v2/namespaces/datadog/repositories/agent-package/tags
      | jq -r '.results[] | .name' | sort | tail -n 2 | head -n 1)
    - export STABLE_INSTALLER_VERSION_PACKAGE=$(curl --retry 10 --retry-all-errors -sS
      https://hub.docker.com/v2/namespaces/datadog/repositories/installer-package/tags
      | jq -r '.results[] | .name' | sort | tail -n 2 | head -n 1)
    - mkdir -p $GOPATH/pkg/mod/cache && tar xJf modcache_e2e.tar.xz -C $GOPATH/pkg/mod/cache
      || exit 101
    - rm -f modcache_e2e.tar.xz
    - mkdir -p ~/.aws
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E profile >> ~/.aws/config
      || exit $?
    - export AWS_PROFILE=agent-qa-ci
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AWS_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AWS_PRIVATE_KEY_PATH && chmod 600 $E2E_AWS_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_AWS_PRIVATE_KEY_PATH || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_AZURE_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_AZURE_PRIVATE_KEY_PATH && chmod 600 $E2E_AZURE_PRIVATE_KEY_PATH &&
      $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_key_rsa > $E2E_AZURE_PRIVATE_KEY_PATH
      || exit $?
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $AGENT_QA_E2E ssh_public_key_rsa > $E2E_GCP_PUBLIC_KEY_PATH
      || exit $?
    - touch $E2E_GCP_PRIVATE_KEY_PATH && chmod 600 $E2E_GCP_PRIVATE_KEY_PATH && $CI_PROJECT_DIR/tools/ci/fetch_secret.sh
      $AGENT_QA_E2E ssh_key_rsa > $E2E_GCP_PRIVATE_KEY_PATH || exit $?
    - pulumi login "s3://dd-pulumi-state?region=us-east-1&awssdk=v2&profile=$AWS_PROFILE"
    - ARM_CLIENT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE client_id)
      || exit $?; export ARM_CLIENT_ID
    - ARM_CLIENT_SECRET=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE token)
      || exit $?; export ARM_CLIENT_SECRET
    - ARM_TENANT_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE tenant_id)
      || exit $?; export ARM_TENANT_ID
    - ARM_SUBSCRIPTION_ID=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_AZURE subscription_id)
      || exit $?; export ARM_SUBSCRIPTION_ID
    - $CI_PROJECT_DIR/tools/ci/fetch_secret.sh $E2E_GCP credentials_json > ~/gcp-credentials.json
      || exit $?
    - export GOOGLE_APPLICATION_CREDENTIALS=~/gcp-credentials.json
    - inv -e gitlab.generate-ci-visibility-links --output=$EXTERNAL_LINKS_PATH
    image: registry.ddbuild.io/ci/test-infra-definitions/runner$TEST_INFRA_DEFINITIONS_BUILDIMAGES_SUFFIX:$TEST_INFRA_DEFINITIONS_BUILDIMAGES
    needs:
    - go_e2e_deps
    - deploy_windows_testing-a7
    - deploy_installer_oci
    - deploy_agent_oci
+   - qa_installer_script_windows
    parallel:
      matrix:
      - EXTRA_PARAMS: --run "TestAgentInstallsWithAgentUser$"
      - EXTRA_PARAMS: --run "TestAgentInstalls$"
      - EXTRA_PARAMS: --run "TestAgentUpgrades$"
+     - EXTRA_PARAMS: --run "TestInstallScript$"
      - EXTRA_PARAMS: --run "TestInstallScriptWithAgentUser$"
      - EXTRA_PARAMS: --run "TestInstaller$"
      - EXTRA_PARAMS: --run "TestInstallerRollback$"
      - EXTRA_PARAMS: --run "TestInstallerSystemIntegrity$"
      - EXTRA_PARAMS: --run "TestInstallerUpgrades$"
    rules:
    - if: $RUN_E2E_TESTS == "off"
      when: never
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - if: $RUN_E2E_TESTS == "on"
      when: on_success
    - if: $CI_COMMIT_BRANCH == "main"
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
      when: on_success
    - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
      when: on_success
    - changes:
        compare_to: main
        paths:
        - .gitlab/e2e/e2e.yml
        - test/new-e2e/pkg/**/*
        - test/new-e2e/go.mod
        - flakes.yaml
    - changes:
        compare_to: main
        paths:
        - .gitlab/**/*
        - omnibus/config/**/*
        - pkg/fleet/**/*
        - cmd/installer/**/*
        - test/new-e2e/tests/installer/**/*
        - tasks/installer.py
      when: on_success
    - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
      when: never
    - allow_failure: true
      when: manual
    script:
    - inv -e new-e2e-tests.run --targets $TARGETS -c ddagent:imagePullRegistry=669783387624.dkr.ecr.us-east-1.amazonaws.com
      -c ddagent:imagePullUsername=AWS -c ddagent:imagePullPassword=$(aws ecr get-login-password)
      --junit-tar junit-${CI_JOB_ID}.tgz ${EXTRA_PARAMS} --test-washer --logs-folder=$E2E_OUTPUT_DIR/logs
      --logs-post-processing --logs-post-processing-test-depth=$E2E_LOGS_PROCESSING_TEST_DEPTH
    stage: e2e
    tags:
    - arch:amd64
    variables:
      E2E_AWS_PRIVATE_KEY_PATH: /tmp/agent-qa-aws-ssh-key
      E2E_AWS_PUBLIC_KEY_PATH: /tmp/agent-qa-aws-ssh-key.pub
      E2E_AZURE_PRIVATE_KEY_PATH: /tmp/agent-qa-azure-ssh-key
      E2E_AZURE_PUBLIC_KEY_PATH: /tmp/agent-qa-azure-ssh-key.pub
      E2E_COMMIT_SHA: $CI_COMMIT_SHORT_SHA
      E2E_GCP_PRIVATE_KEY_PATH: /tmp/agent-qa-gcp-ssh-key
      E2E_GCP_PUBLIC_KEY_PATH: /tmp/agent-qa-gcp-ssh-key.pub
      E2E_KEY_PAIR_NAME: datadog-agent-ci-rsa
      E2E_LOGS_PROCESSING_TEST_DEPTH: 1
      E2E_OUTPUT_DIR: $CI_PROJECT_DIR/e2e-output
      E2E_PIPELINE_ID: $CI_PIPELINE_ID
      EXTERNAL_LINKS_PATH: external_links_$CI_JOB_ID.json
      FLEET_INSTALL_METHOD: windows
      KUBERNETES_CPU_REQUEST: 6
      KUBERNETES_MEMORY_LIMIT: 16Gi
      KUBERNETES_MEMORY_REQUEST: 12Gi
      SHOULD_RUN_IN_FLAKES_FINDER: 'true'
      TARGETS: ./tests/installer/windows
      TEAM: fleet
powershell_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
+   - 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: deploy_packages
+   stage: package_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}

Added Jobs

qa_installer_script_windows
qa_installer_script_windows:
  before_script:
  - ls $WINDOWS_POWERSHELL_DIR
  image: registry.ddbuild.io/ci/datadog-agent-buildimages/gitlab_agent_deploy$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
  needs:
  - powershell_script_signing
  rules:
  - if: $RUN_E2E_TESTS == "off"
    when: never
  - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
    when: never
  - if: $RUN_E2E_TESTS == "on"
    when: on_success
  - if: $CI_COMMIT_BRANCH == "main"
    when: on_success
  - if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+\.x$/
    when: on_success
  - if: $CI_COMMIT_TAG =~ /^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$/
    when: on_success
  - changes:
      compare_to: main
      paths:
      - .gitlab/e2e/e2e.yml
      - test/new-e2e/pkg/**/*
      - test/new-e2e/go.mod
      - flakes.yaml
  - changes:
      compare_to: main
      paths:
      - .gitlab/**/*
      - omnibus/config/**/*
      - pkg/fleet/**/*
      - cmd/installer/**/*
      - test/new-e2e/tests/installer/**/*
      - tasks/installer.py
    when: on_success
  - if: $CI_COMMIT_BRANCH =~ /^mq-working-branch-/
    when: never
  - allow_failure: true
    when: manual
  script:
  - $S3_CP_CMD $WINDOWS_POWERSHELL_DIR/Install-Datadog.ps1 s3://${INSTALLER_TESTING_S3_BUCKET}/pipeline-${CI_PIPELINE_ID}/scripts/Install-Datadog.ps1
  stage: deploy_packages
  tags:
  - arch:amd64

Renamed Jobs

  • qa_installer_script -> qa_installer_script_linux

Changes Summary

Removed Modified Added Renamed
0 4 1 1

ℹ️ Diff available in the job log.

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Jan 31, 2025

Uncompressed package size comparison

Comparison with ancestor 5025a79f8c4d17a1d33fb1758cdd2802678819c7

Diff per package
package diff status size ancestor threshold
datadog-agent-aarch64-rpm 0.00MB 870.91MB 870.90MB 0.50MB
datadog-agent-amd64-deb 0.00MB 873.29MB 873.29MB 0.50MB
datadog-agent-arm64-deb 0.00MB 861.19MB 861.19MB 0.50MB
datadog-dogstatsd-amd64-deb 0.00MB 59.04MB 59.04MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.00MB 59.12MB 59.12MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.00MB 59.12MB 59.12MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 56.52MB 56.52MB 0.50MB
datadog-heroku-agent-amd64-deb 0.00MB 445.51MB 445.51MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 86.11MB 86.11MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 86.18MB 86.18MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 86.18MB 86.18MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 82.39MB 82.39MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 82.46MB 82.46MB 0.50MB
datadog-agent-x86_64-rpm -0.00MB 883.03MB 883.03MB 0.50MB
datadog-agent-x86_64-suse -0.00MB 883.03MB 883.03MB 0.50MB

Decision

✅ Passed

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Jan 31, 2025

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

inv aws.create-vm --pipeline-id=54871860 --os-family=ubuntu

Note: This applies to commit 2ae6f38

Copy link

cit-pr-commenter bot commented Jan 31, 2025

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: c33977ca-71c3-45eb-bb3c-ee1b630c45ce

Baseline: 5025a79
Comparison: 2ae6f38
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
quality_gate_logs % cpu utilization +1.34 [-1.71, +4.40] 1 Logs
quality_gate_idle_all_features memory utilization +0.61 [+0.54, +0.68] 1 Logs bounds checks dashboard
tcp_syslog_to_blackhole ingress throughput +0.61 [+0.52, +0.70] 1 Logs
file_tree memory utilization +0.42 [+0.36, +0.48] 1 Logs
file_to_blackhole_500ms_latency egress throughput +0.22 [-0.57, +1.00] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization +0.18 [-0.68, +1.05] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput +0.06 [-0.85, +0.98] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.05 [-0.78, +0.88] 1 Logs
file_to_blackhole_100ms_latency egress throughput +0.03 [-0.67, +0.73] 1 Logs
uds_dogstatsd_to_api ingress throughput +0.00 [-0.27, +0.28] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.02, +0.01] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.02 [-0.88, +0.85] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.02 [-0.65, +0.61] 1 Logs
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.12 [-0.58, +0.35] 1 Logs
quality_gate_idle memory utilization -0.26 [-0.31, -0.20] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency egress throughput -0.91 [-1.70, -0.13] 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 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
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, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_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_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.

@julien-lebot julien-lebot added the ask-review Ask required teams to review this PR label Jan 31, 2025
Copy link
Member

@chouetz chouetz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for devx part

# Jobs that deploy agent packages on QA environment, to be used by e2e tests
# Jobs that deploy agent packages on QA environment, to be used by e2e tests.
# We use two separate jobs for Windows and Linux so that a failure in deploying the
# Linux / Windows scrip doesn't impact the other OS (i.e. Windows scripts failing to be signed blocking Linux E2E tests).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Linux / Windows scrip doesn't impact the other OS (i.e. Windows scripts failing to be signed blocking Linux E2E tests).
# Linux / Windows scripts doesn't impact the other OS (i.e. Windows scripts failing to be signed blocking Linux E2E tests).

# Jobs that deploy agent packages on QA environment, to be used by e2e tests
# Jobs that deploy agent packages on QA environment, to be used by e2e tests.
# We use two separate jobs for Windows and Linux so that a failure in deploying the
# Linux / Windows scrip doesn't impact the other OS (i.e. Windows scripts failing to be signed blocking Linux E2E tests).

qa_installer_script:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we call this one like this?

Suggested change
qa_installer_script:
qa_installer_script_linux:

@@ -296,10 +297,14 @@ func installCommand() *cobra.Command {
}
defer func() { i.stop(err) }()
i.span.SetTag("params.url", args[0])
if forceInstall {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this is an issue, forceInstall seems used here whereas it's not initialized on line 287, and the definition of the flag is set below. It's maybe normal but I prefer to ask my noob question just in case.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be false by default. And will take the value given by the --force flag. Because of line 307.
That's a bit misleading but since this line will be executed only once the command is actually ran. The value should properly be updated by the line that appears later in the code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, thanks @KevinFairise2 - that's actually how the arguments work in a cobra command. The RunE command uses the local variables whose address is captured in the cmd.Flags() to be updated below.

Copy link
Member

@jennchenn jennchenn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm for container-integrations

@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Feb 4, 2025

Static quality checks ✅

Please find below the results from static quality gates

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 844.76MiB 858.45MiB 203.55MiB 214.3MiB
static_quality_gate_docker_agent_amd64 928.99MiB 942.69MiB 310.64MiB 321.56MiB

@julien-lebot
Copy link
Contributor Author

/merge

@dd-devflow
Copy link

dd-devflow bot commented Feb 5, 2025

Devflow running: /merge

View all feedbacks in Devflow UI.


2025-02-05 10:55:22 UTC ℹ️ MergeQueue: pull request added to the queue

The median merge time in main is 27m.


2025-02-05 11:30:32 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit c741f92 into main Feb 5, 2025
462 of 463 checks passed
@dd-mergequeue dd-mergequeue bot deleted the julien.lebot/fleet_automation/add_force_flag branch February 5, 2025 11:30
@github-actions github-actions bot added this to the 7.64.0 milestone Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ask-review Ask required teams to review this PR changelog/no-changelog long review PR is complex, plan time to review it os/windows qa/done QA done before merge and regressions are covered by tests team/windows-agent
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants