Skip to content

Commit 9f38758

Browse files
committed
chore: Fixing integration tests
1 parent d322191 commit 9f38758

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

dockerHelper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func CreateDockerfile(imageName string, dockerFROM string, dockerCMD string, doc
117117
}
118118

119119
baseWindowsDockerFrom := []string{
120-
"FROM mcr.microsoft.com/windows/servercore:ltsc2022",
120+
"FROM mcr.microsoft.com/windows/servercore:ltsc2025",
121121
`SHELL ["powershell"]`,
122122
"RUN NET USER nrdiagadmin /add",
123123
"RUN NET LOCALGROUP administrators /add nrdiagadmin",

tasks/infra/agent/integrationTests_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- test_name: InfrastructureVersionPresentWindows
22
dockerfile_lines:
33
- ADD https://download.newrelic.com/infrastructure_agent/windows/newrelic-infra.msi newrelic-infra.msi
4-
- RUN $p = Start-Process msiexec.exe -ArgumentList '/a','newrelic-infra.msi','/qn','TARGETDIR=C:\Program Files\' -Wait -PassThru; if ($p.ExitCode -ne 0) { exit $p.ExitCode }
4+
- RUN $p = Start-Process msiexec.exe -ArgumentList '/a','newrelic-infra.msi','/qn','TARGETDIR=C:\Program Files\','/l*v','C:\install.log' -PassThru; if (-not $p.WaitForExit(300000)) { Write-Host 'MSIEXEC HUNG after 5min'; if (Test-Path C:\install.log) { Write-Host '=== MSI LOG TAIL ==='; Get-Content C:\install.log -Tail 300 }; try { $p.Kill() } catch {}; exit 1 }; Write-Host ('MSIEXEC exited with code ' + $p.ExitCode); if (Test-Path C:\install.log) { Write-Host '=== MSI LOG TAIL ==='; Get-Content C:\install.log -Tail 100 }; if ($p.ExitCode -ne 0) { exit $p.ExitCode }
55
- COPY ["tasks/infra/config/fixtures/minimal_infra_config/newrelic-infra.yml", "C:/Program Files/New Relic/newrelic-infra/newrelic-infra.yml"]
66
- RUN Write-Host DIAG_EXE_EXISTS=; Test-Path 'C:/Program Files/New Relic/newrelic-infra/newrelic-infra.exe'; Write-Host DIAG_YML_EXISTS=; Test-Path 'C:/Program Files/New Relic/newrelic-infra/newrelic-infra.yml'; Write-Host DIAG_YML_CONTENT_START; Get-Content 'C:/Program Files/New Relic/newrelic-infra/newrelic-infra.yml'; Write-Host DIAG_YML_CONTENT_END; Write-Host DIAG_DIR_LISTING; Get-ChildItem 'C:/Program Files/New Relic/newrelic-infra/'
77
docker_cmd: ./nrdiag_x64.exe -y -filter all

0 commit comments

Comments
 (0)