cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ansible-test: make the httptester for Windows more resiliant around the shell chosen (#51416)

Browse source
This commit is contained in:
Jordan Borean 2019-01-30 07:50:23 +10:00 committed by GitHub
parent ce898bfde5
commit ce8db479f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/runner/lib/executor.py
View file

@ -583,9 +583,9 @@ def command_windows_integration(args):
manage = ManageWindowsCI(remote) manage = ManageWindowsCI(remote)
manage.upload("test/runner/setup/windows-httptester.ps1", watcher_path) manage.upload("test/runner/setup/windows-httptester.ps1", watcher_path)
# need to use -Command as we cannot pass an array of values with -File # We cannot pass an array of string with -File so we just use a delimiter for multiple values
script = "powershell.exe -NoProfile -ExecutionPolicy Bypass -Command .\\%s -Hosts %s" \ script = "powershell.exe -NoProfile -ExecutionPolicy Bypass -File .\\%s -Hosts \"%s\"" \
% (watcher_path, ", ".join(HTTPTESTER_HOSTS)) % (watcher_path, "|".join(HTTPTESTER_HOSTS))
if args.verbosity > 3: if args.verbosity > 3:
script += " -Verbose" script += " -Verbose"
manage.ssh(script, options=ssh_options, force_pty=False) manage.ssh(script, options=ssh_options, force_pty=False)
@ -600,7 +600,7 @@ def command_windows_integration(args):
for remote in [r for r in remotes if r.version != '2008']: for remote in [r for r in remotes if r.version != '2008']:
# delete the tmp file that keeps the http-tester alive # delete the tmp file that keeps the http-tester alive
manage = ManageWindowsCI(remote) manage = ManageWindowsCI(remote)
manage.ssh("del %s /F /Q" % watcher_path) manage.ssh("cmd.exe /c \"del %s /F /Q\"" % watcher_path, force_pty=False)
watcher_path = "ansible-test-http-watcher-%s.ps1" % time.time() watcher_path = "ansible-test-http-watcher-%s.ps1" % time.time()
pre_target = forward_ssh_ports pre_target = forward_ssh_ports

7
test/runner/setup/windows-httptester.ps1
View file

@ -9,13 +9,14 @@ Run this with SSH with the -R arguments to foward ports 8080 and 8443 to the
httptester container. httptester container.
.PARAMETER Hosts .PARAMETER Hosts
A list of hostnames to add to the Windows hosts file for the httptester A list of hostnames, delimited by '|', to add to the Windows hosts file for the
container. httptester container, e.g. 'ansible.host.com|secondary.host.test'.
#> #>
[CmdletBinding()] [CmdletBinding()]
param( param(
[Parameter(Mandatory=$true, Position=0)][String[]]$Hosts [Parameter(Mandatory=$true, Position=0)][String]$Hosts
) )
$Hosts = $Hosts.Split('|')
$ProgressPreference = "SilentlyContinue" $ProgressPreference = "SilentlyContinue"
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"