Skip to content

Try to find Windows packages on a pipeline-ID specific folder before common folder #1613

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
dd-mergequeue merged 2 commits into from
Jul 9, 2025
Merged

Try to find Windows packages on a pipeline-ID specific folder before common folder #1613

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ff08a4
include the pipeline ID in windows packages path (#1601)
chouquette Jun 27, 2025
1e1ac24
Make path determination more resilient w.r.t. including pipeline id o…
alopezz Jul 7, 2025
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
12 changes: 10 additions & 2 deletions components/datadog/agent/package.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,16 @@ func GetPackagePath(localPath string, flavor tifos.Flavor, agentFlavor string, a
packagePath := localPath
matches := []string{}
if pathInfo.IsDir() {
packagePath = path.Join(packagePath, subFolder)
packagePath = path.Join(packagePath, "pkg")
packagePath = path.Join(packagePath, subFolder, "pkg")

// On Windows, if a dedicated pipeline-identified folder is available, use that
if flavor == tifos.WindowsServer {
packagePathWithPipelineID := path.Join(packagePath, "pipeline-"+pipelineID)
if info, err := os.Stat(packagePathWithPipelineID); err == nil && info.IsDir() {
packagePath = packagePathWithPipelineID
}
}

entries, err := os.ReadDir(packagePath)
if err != nil {
return "", err
Expand Down