diff options
| -rwxr-xr-x | openstack/tester | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/openstack/tester b/openstack/tester index 259309b..88e3322 100755 --- a/openstack/tester +++ b/openstack/tester @@ -86,9 +86,10 @@ class DeployedSystemInstance(object): def runcmd(self, argv, chdir='.', **kwargs): ssh_cmd = ['ssh', '-o', 'StrictHostKeyChecking=no', '-o', 'UserKnownHostsFile=/dev/null', self.ssh_host] - cmd = ['sh', '-c', 'cd "$1" && shift && exec "$@"', '-', chdir] + cmd = ['sh', '-x', '-c', 'cd "$1" && shift && exec "$@"', '-', chdir] cmd += argv ssh_cmd.append(' '.join(map(pipes.quote, cmd))) + print ssh_cmd return cliapp.runcmd(ssh_cmd, **kwargs) def _wait_for_dhcp(self, timeout): @@ -275,7 +276,7 @@ class ReleaseApp(cliapp.Application): print('Running test: ' + data['name']) for cmd in data['commands']: print('$ ' + cmd) - instance.runcmd(['sh', '-c', cmd], stdout=self.output) + instance.runcmd(['sh', '-x', '-c', cmd], stdout=self.output) def deploy_and_test_systems(self, tests): """Run the deployments and tests""" |