Skip to content

Revert "Make sure we keep the testing params when extra params does not override minor version" #436

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

Merged
gh-worker-dd-mergequeue-cf854d merged 2 commits into from
Jul 23, 2026
Merged

Revert "Make sure we keep the testing params when extra params does not override minor version" #436

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd8f9bd
Revert "Make sure we keep the testing params when extra params does n…
KevinFairise2 Jul 2, 2026
c155ad1
Merge branch 'main' into revert-430-kfairise/fix-install-args
oleroydatadog Jul 23, 2026
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
2 changes: 1 addition & 1 deletion test/e2e/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (s *linuxInstallerTestSuite) InstallAgent(agentVersion int, extraParam ...s
}

extraParamLength := len(extraParam)
if agentVersion == 7 && !strings.Contains(strings.Join(extraParam, " "), "DD_AGENT_MINOR_VERSION") { // If DD_AGENT_MINOR_VERSION is set, we need to not set the testing variables
if agentVersion == 7 && extraParamLength == 0 {

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Restore trial-repo env vars when extra params are present

In downstream CI with TEST_PIPELINE_ID, .gitlab-ci.yml exports TESTING_YUM_VERSION_PATH and TESTING_APT_REPO_VERSION before running the E2E matrix, but this guard now forwards those values to the remote install command only when InstallAgent(7) has no extra parameters. Suites that install Agent 7 with feature flags but no DD_AGENT_MINOR_VERSION (for example discovery, FIPS, security-agent, DDOT) will silently install from the default repos instead of the pipeline's test package repositories, so those jobs can pass without exercising the candidate packages they are meant to validate.

Useful? React with 👍 / 👎.

if val, ok := os.LookupEnv("TESTING_YUM_VERSION_PATH"); ok {
scriptEnvVariable = scriptEnvVariable + fmt.Sprintf(" TESTING_YUM_VERSION_PATH='%s'", val)
}
Expand Down
Loading