Skip to content

fix(tests): Apply more fixes for Windows Integration test flakiness #266

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
daffinito merged 1 commit into from
Jul 14, 2026
+54 −10
Merged

fix(tests): Apply more fixes for Windows Integration test flakiness #266

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
3 changes: 2 additions & 1 deletion tasks/infra/agent/integrationTests_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
- ADD https://download.newrelic.com/infrastructure_agent/binaries/windows/amd64/newrelic-infra-amd64.1.77.1.zip C:/nra.zip
- RUN Expand-Archive -Path 'C:\nra.zip' -DestinationPath 'C:\' -Force; Write-Host '=== EXTRACTED CONTENTS ==='; Get-ChildItem 'C:\Program Files\New Relic\newrelic-infra\' | Select-Object FullName
- COPY ["tasks/infra/config/fixtures/minimal_infra_config/newrelic-infra.yml", "C:/Program Files/New Relic/newrelic-infra/newrelic-infra.yml"]
docker_cmd: ./nrdiag_x64.exe -y -filter all
- RUN (Get-Date).ToUniversalTime().ToString('yyyy-MM-ddTHH:mm:ssZ') | Out-File -FilePath C:/app/release_date.txt -Encoding ascii -NoNewline
docker_cmd: $d = Get-Content C:/app/release_date.txt; ./nrdiag_x64.exe -y -filter all -o Infra/Agent/Version.releaseDateOverride=$d
log_entry_expected:
- Info.*Infra/Agent/Version.*
log_entry_not_expected:
15 changes: 11 additions & 4 deletions tasks/infra/agent/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ var (
errRecommendedUpgrade = fmt.Errorf("New Relic Infrastructure Agent upgrade is recommended, installed agent was released more than one year ago")
)

const releaseDateOverrideKey = "releaseDateOverride"

type githubReleaseData struct {
PublishedAt string `json:"published_at"`
}
Expand Down Expand Up @@ -118,7 +120,7 @@ func (p InfraAgentVersion) Execute(options tasks.Options, upstream map[string]ta
}
}

err = p.validatePublishDate(ver)
err = p.validatePublishDate(ver, options)
if err != nil {
urlUpdateTask := tasks.Result{
URL: "https://docs.newrelic.com/docs/infrastructure/new-relic-infrastructure/installation/update-infrastructure-agent",
Expand Down Expand Up @@ -166,13 +168,13 @@ func (p InfraAgentVersion) getBinaryPath(envVars map[string]string) (string, err
}

// validatePublishDate returns an error if the version was released more than one year ago
func (p InfraAgentVersion) validatePublishDate(version tasks.Ver) error {
func (p InfraAgentVersion) validatePublishDate(version tasks.Ver, options tasks.Options) error {
// Github releases started on version 1.12.0
if version.IsLessThanEq(oldestGithubRelease) {
return errUnsupportedVersion
}

publishData, err := p.getGithubPublishDate(fmt.Sprintf("%d.%d.%d", version.Major, version.Minor, version.Patch))
publishData, err := p.getGithubPublishDate(fmt.Sprintf("%d.%d.%d", version.Major, version.Minor, version.Patch), options)
if err != nil {
return fmt.Errorf("Unable to get New Relic Infrastructure Agent release date: %w", err)
}
Expand All @@ -187,7 +189,12 @@ func (p InfraAgentVersion) validatePublishDate(version tasks.Ver) error {
return nil
}

func (p InfraAgentVersion) getGithubPublishDate(version string) (time.Time, error) {
func (p InfraAgentVersion) getGithubPublishDate(version string, options tasks.Options) (time.Time, error) {
if override := options.Options[releaseDateOverrideKey]; override != "" {
log.Debug("Infra/Agent/Version - using releaseDateOverride, skipping GitHub API call")
return time.Parse(time.RFC3339, override)
}

wrapper := httpHelper.RequestWrapper{
Method: "GET",
URL: githubAPIReleaseURL + version,
Expand Down
46 changes: 41 additions & 5 deletions tasks/infra/agent/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package agent
import (
"bytes"
"errors"
"io/ioutil"
"io"
"net/http"
"time"

Expand Down Expand Up @@ -145,7 +145,7 @@ var _ = Describe("Infra/Agent/Version", func() {
p.runtimeOS = "darwin"
p.httpGetter = func(wrapper httpHelper.RequestWrapper) (*http.Response, error) {
return &http.Response{
Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"published_at": "2022-11-17T10:50:43Z"}`))),
Body: io.NopCloser(bytes.NewReader([]byte(`{"published_at": "2022-11-17T10:50:43Z"}`))),
}, nil
}
p.now = func() time.Time { return time.Date(2022, time.Month(11), 21, 1, 10, 30, 0, time.UTC) }
Expand Down Expand Up @@ -180,7 +180,7 @@ var _ = Describe("Infra/Agent/Version", func() {
p.runtimeOS = "darwin"
p.httpGetter = func(wrapper httpHelper.RequestWrapper) (*http.Response, error) {
return &http.Response{
Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"published_at": "2020-11-17T10:50:43Z"}`))),
Body: io.NopCloser(bytes.NewReader([]byte(`{"published_at": "2020-11-17T10:50:43Z"}`))),
}, nil
}
p.now = func() time.Time { return time.Date(2022, time.Month(11), 21, 1, 10, 30, 0, time.UTC) }
Expand Down Expand Up @@ -355,13 +355,15 @@ var _ = Describe("Infra/Agent/Version", func() {
var (
version tasks.Ver
err error
options tasks.Options
)

JustBeforeEach(func() {
err = p.validatePublishDate(version)
err = p.validatePublishDate(version, options)
})
Context("Version prior to 1.12.0", func() {
BeforeEach(func() {
options = tasks.Options{}
version = tasks.Ver{Major: 1, Minor: 11, Patch: 0, Build: 0}
})

Expand All @@ -372,10 +374,11 @@ var _ = Describe("Infra/Agent/Version", func() {

Context("Up-to-date version", func() {
BeforeEach(func() {
options = tasks.Options{}
version = tasks.Ver{Major: 1, Minor: 33, Patch: 0, Build: 0}
p.httpGetter = func(wrapper httpHelper.RequestWrapper) (*http.Response, error) {
return &http.Response{
Body: ioutil.NopCloser(bytes.NewReader([]byte(`{"published_at": "2021-11-22T10:50:43Z"}`))),
Body: io.NopCloser(bytes.NewReader([]byte(`{"published_at": "2021-11-22T10:50:43Z"}`))),
}, nil
}
p.now = func() time.Time { return time.Date(2022, time.Month(11), 21, 1, 10, 30, 0, time.UTC) }
Expand All @@ -385,6 +388,39 @@ var _ = Describe("Infra/Agent/Version", func() {
Expect(err).To(BeNil())
})
})

Context("releaseDateOverride option is provided", func() {
BeforeEach(func() {
version = tasks.Ver{Major: 1, Minor: 77, Patch: 1, Build: 0}
options = tasks.Options{Options: map[string]string{releaseDateOverrideKey: "2026-07-13T18:04:00Z"}}
p.now = func() time.Time { return time.Date(2026, time.Month(7), 13, 18, 5, 0, 0, time.UTC) }
p.httpGetter = func(wrapper httpHelper.RequestWrapper) (*http.Response, error) {
Fail("httpGetter must not be called when releaseDateOverride is set")
return nil, nil
}
})

It("should not return an error and should not hit the network", func() {
Expect(err).To(BeNil())
})
})

Context("releaseDateOverride option is empty", func() {
BeforeEach(func() {
version = tasks.Ver{Major: 1, Minor: 33, Patch: 0, Build: 0}
options = tasks.Options{Options: map[string]string{releaseDateOverrideKey: ""}}
p.httpGetter = func(wrapper httpHelper.RequestWrapper) (*http.Response, error) {
return &http.Response{
Body: io.NopCloser(bytes.NewReader([]byte(`{"published_at": "2021-11-22T10:50:43Z"}`))),
}, nil
}
p.now = func() time.Time { return time.Date(2022, time.Month(11), 21, 1, 10, 30, 0, time.UTC) }
})

It("should fall back to the GitHub API path", func() {
Expect(err).To(BeNil())
})
})
})
})
})
Loading