Skip to content

Stop installing dd-pkg at runtime #51161

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.

Sign up for GitHub

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
AliDatadog wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Stop installing dd-pkg at runtime #51161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ variables:
DDA_FEATURE_FLAGS_CI_VAULT_KEY: token
DDA_FEATURE_FLAGS_CI_VAULT_PATH: k8s/gitlab-runner-datadog-agent/datadog-agent/$DDA_CLIENT_TOKEN

DD_PKG_VERSION: "latest"
DD_PKG_GITLAB_URL: "https://artifact-gateway.us1.ddbuild.io/internal/artifact-gateway/api/v4"
PIPELINE_KEY_ALIAS: "alias/ci_datadog-agent_pipeline-key"

Expand Down
3 changes: 1 addition & 2 deletions .gitlab/.pre/common/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@
- omnibus/vendor/bundle

## Shared `dd-pkg` steps:
# - Install `dd-pkg`, logging the version in use for the job
# - Verify the build image provides `dd-pkg`, logging the version in use for the job
.setup_dd_pkg:
- curl --retry 5 -sSL "https://dd-package-tools.s3.amazonaws.com/dd-pkg/${DD_PKG_VERSION}/dd-pkg_Linux_${DD_PKG_ARCH}.tar.gz" | tar -xz -C /usr/local/bin dd-pkg
- dd-pkg version
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 21, 2026

Choose a reason for hiding this comment

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

P1 Badge Bump dd-pkg-capable CI images atomically

Switching .setup_dd_pkg from runtime install to just dd-pkg version makes every job that references it fail immediately when the selected image lacks the binary (GitLab stops on non-zero script commands). In this same commit, no CI_IMAGE_LINUX, CI_IMAGE_GITLAB_AGENT_DEPLOY, or CI_IMAGE_RPM_ARMHF values are updated, yet those images are used by packaging/deploy/release jobs that call .setup_dd_pkg (for example in .gitlab/build/packaging/{deb,rpm}.yml, .gitlab/deploy/deploy_packages/deploy_common.yml, and .gitlab/distribute/trigger_release/*.yml), so merging this change before image bumps will break those pipelines with dd-pkg: command not found.

Useful? React with 👍 / 👎.


# - Lint packages produced by Omnibus (supports only deb and rpm packages)
Expand Down
1 change: 0 additions & 1 deletion .gitlab/build/package_build/heroku.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
KUBERNETES_MEMORY_REQUEST: "32Gi"
KUBERNETES_MEMORY_LIMIT: "32Gi"
KUBERNETES_CPU_REQUEST: 16
DD_PKG_ARCH: "x86_64"
PACKAGE_ARCH: "amd64"
DD_CC: "x86_64-unknown-linux-gnu-gcc"
DD_CXX: "x86_64-unknown-linux-gnu-g++"
Expand Down
3 changes: 0 additions & 3 deletions .gitlab/build/packaging/deb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,13 @@ include:
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
tags: ["arch:amd64", "specific:true"]
variables:
DD_PKG_ARCH: x86_64
PACKAGE_ARCH: amd64

.package_deb_arm64:
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
tags: ["arch:arm64", "specific:true"]
variables:
PACKAGE_ARCH: arm64
DD_PKG_ARCH: arm64

agent_deb-x64-a7:
extends: [.package_deb_common, .package_deb_x86]
Expand Down Expand Up @@ -171,7 +169,6 @@ iot_agent_deb-armhf:
needs: ["iot-agent-armhf"]
variables:
PACKAGE_ARCH: armhf
DD_PKG_ARCH: "arm64"
FORCED_PACKAGE_COMPRESSION_LEVEL: 5
STATIC_QUALITY_GATE_NAME: "static_quality_gate_iot_agent_deb_armhf"
script:
Expand Down
3 changes: 0 additions & 3 deletions .gitlab/build/packaging/rpm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ include:
image: registry.ddbuild.io/ci/datadog-agent-buildimages/linux$CI_IMAGE_LINUX_SUFFIX:$CI_IMAGE_LINUX
tags: ["arch:amd64", "specific:true"]
variables:
DD_PKG_ARCH: x86_64
PACKAGE_ARCH: amd64
STATIC_QUALITY_GATE_ARCH: x86_64

Expand All @@ -42,7 +41,6 @@ include:
tags: ["arch:arm64", "specific:true"]
variables:
PACKAGE_ARCH: arm64
DD_PKG_ARCH: arm64
STATIC_QUALITY_GATE_ARCH: aarch64

.package_suse_rpm_common:
Expand Down Expand Up @@ -268,7 +266,6 @@ iot_agent_rpm-armhf:
needs: ["iot-agent-armhf"]
variables:
PACKAGE_ARCH: armhf
DD_PKG_ARCH: "arm64"
# TODO(agent-devx): Re-enable VPA by removing this when it will be possible to configure memory lower bound to avoid OOMs
DD_ENABLE_VPA: false
before_script:
Expand Down
2 changes: 0 additions & 2 deletions .gitlab/deploy/deploy_packages/deploy_common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
tags: ["arch:amd64", "specific:true"]
rules:
!reference [.on_deploy]
variables:
DD_PKG_ARCH: x86_64
before_script:
- ls $OMNIBUS_PACKAGE_DIR
# Make job fail if there no files to upload are found
Expand Down
1 change: 0 additions & 1 deletion .gitlab/distribute/trigger_release/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# We only want to allow automatically triggering agent-release-manangement
# pipelines when everything goes well
variables:
DD_PKG_ARCH: x86_64
RELEASE_PRODUCT: datadog-agent
script:
- !reference [.setup_dd_pkg]
Expand Down
1 change: 0 additions & 1 deletion .gitlab/distribute/trigger_release/installer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# We only want to allow automatically triggering agent-release-manangement
# pipelines when everything goes well
variables:
DD_PKG_ARCH: x86_64
RELEASE_PRODUCT: datadog-installer
script:
- !reference [.setup_dd_pkg]
Expand Down
2 changes: 0 additions & 2 deletions tasks/unit_tests/testdata/variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ variables:
SLACK_AGENT: slack-agent-ci # agent-devx
# End vault variables

DD_PKG_VERSION: "latest"

# Job stage attempts (see https://docs.gitlab.com/ee/ci/runners/configure_runners.html#job-stages-attempts)
ARTIFACT_DOWNLOAD_ATTEMPTS: 2
EXECUTOR_JOB_SECTION_ATTEMPTS: 2
Expand Down
Loading