|
@@ -374,7 +374,7 @@ Try {
|
|
Write-Host -ForegroundColor Green "---------------------------------------------------------------------------"
|
|
Write-Host -ForegroundColor Green "---------------------------------------------------------------------------"
|
|
Write-Host -ForegroundColor Green " Failed to get a response from the control daemon. It may be down."
|
|
Write-Host -ForegroundColor Green " Failed to get a response from the control daemon. It may be down."
|
|
Write-Host -ForegroundColor Green " Try re-running this CI job, or ask on #docker-maintainers on docker slack"
|
|
Write-Host -ForegroundColor Green " Try re-running this CI job, or ask on #docker-maintainers on docker slack"
|
|
- Write-Host -ForegroundColor Green " to see if the the daemon is running. Also check the service configuration."
|
|
|
|
|
|
+ Write-Host -ForegroundColor Green " to see if the daemon is running. Also check the service configuration."
|
|
Write-Host -ForegroundColor Green " DOCKER_HOST is set to $DOCKER_HOST."
|
|
Write-Host -ForegroundColor Green " DOCKER_HOST is set to $DOCKER_HOST."
|
|
Write-Host -ForegroundColor Green "---------------------------------------------------------------------------"
|
|
Write-Host -ForegroundColor Green "---------------------------------------------------------------------------"
|
|
Write-Host
|
|
Write-Host
|
|
@@ -554,7 +554,7 @@ Try {
|
|
$env:GOROOT="$env:TEMP\go"
|
|
$env:GOROOT="$env:TEMP\go"
|
|
Write-Host -ForegroundColor Green "INFO: $(go version)"
|
|
Write-Host -ForegroundColor Green "INFO: $(go version)"
|
|
|
|
|
|
- # Work out the the -H parameter for the daemon under test (DASHH_DUT) and client under test (DASHH_CUT)
|
|
|
|
|
|
+ # Work out the -H parameter for the daemon under test (DASHH_DUT) and client under test (DASHH_CUT)
|
|
#$DASHH_DUT="npipe:////./pipe/$COMMITHASH" # Can't do remote named pipe
|
|
#$DASHH_DUT="npipe:////./pipe/$COMMITHASH" # Can't do remote named pipe
|
|
#$ip = (resolve-dnsname $env:COMPUTERNAME -type A -NoHostsFile -LlmnrNetbiosOnly).IPAddress # Useful to tie down
|
|
#$ip = (resolve-dnsname $env:COMPUTERNAME -type A -NoHostsFile -LlmnrNetbiosOnly).IPAddress # Useful to tie down
|
|
$DASHH_CUT="tcp://127.0.0.1`:2357" # Not a typo for 2375!
|
|
$DASHH_CUT="tcp://127.0.0.1`:2357" # Not a typo for 2375!
|
|
@@ -813,7 +813,7 @@ Try {
|
|
if ($null -ne $env:INTEGRATION_IN_CONTAINER) {
|
|
if ($null -ne $env:INTEGRATION_IN_CONTAINER) {
|
|
Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container"
|
|
Write-Host -ForegroundColor Green "INFO: Integration tests being run inside a container"
|
|
# Note we talk back through the containers gateway address
|
|
# Note we talk back through the containers gateway address
|
|
- # And the ridiculous lengths we have to go to to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver)
|
|
|
|
|
|
+ # And the ridiculous lengths we have to go to get the default gateway address... (GetNetIPConfiguration doesn't work in nanoserver)
|
|
# I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead...
|
|
# I just could not get the escaping to work in a single command, so output $c to a file and run that in the container instead...
|
|
# Not the prettiest, but it works.
|
|
# Not the prettiest, but it works.
|
|
$c | Out-File -Force "$env:TEMP\binary\runIntegrationCLI.ps1"
|
|
$c | Out-File -Force "$env:TEMP\binary\runIntegrationCLI.ps1"
|