diff options
| -rwxr-xr-x | testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh | 2 | ||||
| -rwxr-xr-x | testsuites/rubbos/run_rubbos.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh index 884315be..b08d2fb7 100755 --- a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh +++ b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh @@ -191,7 +191,7 @@ fetch_remote_resources() { direct_ssh() { echo "127.0.0.1 $(hostname)" >> /etc/hosts echo "write hosts file: 127.0.0.1 $(hostname)" - cp ${LOCAL_GIT_REPO}/bottlenecks/utils/infra_setup/bottlenecks_key/bottlenecks_key /home/ubuntu/.ssh/id_rsa + cp /home/ubuntu/bottlenecks_key /home/ubuntu/.ssh/id_rsa sudo chmod 0600 /home/ubuntu/.ssh/id_rsa echo 'StrictHostKeyChecking no' > /home/ubuntu/.ssh/config sudo chown -R ubuntu:ubuntu /home/ubuntu/.ssh diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py index 63b9ae07..18103f7a 100755 --- a/testsuites/rubbos/run_rubbos.py +++ b/testsuites/rubbos/run_rubbos.py @@ -369,6 +369,11 @@ def rubbos_run(): print "Exec shell: " + cmd subprocess.call(cmd, shell=True) + cmd = "scp " + ssh_args + Bottlenecks_repo_dir + \ + "/utils/infra_setup/bottlenecks_key/bottlenecks_key ubuntu@" + control_public_ip + ":/home/ubuntu/" + print "Exec shell: " + cmd + subprocess.call(cmd, shell=True) + # call remote run_rubbos_internal.sh cmd = "ssh " + ssh_args + " ubuntu@" + control_public_ip + \ ' "sudo /home/ubuntu/run_rubbos_internal.sh /home/ubuntu/rubbos.conf /home/ubuntu/btnks-results" ' |