Skip to content

Commit 84f3dbd

Browse files
riya-17portante
authored andcommitted
Adding ssh for creating hostname directory on Host machine
1 parent 43c2737 commit 84f3dbd

File tree

10 files changed

+11
-1
lines changed

10 files changed

+11
-1
lines changed

agent/util-scripts/gold/pbench-copy-results/test-31.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ user_script = sleep
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:ndk:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
6060
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
61+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6263
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_ndk-test-1_2018.05.23T03.21.32.tar.xz.md5.check && mv pbench-user-benchmark_ndk-test-1_2018.05.23T03.21.32.tar.xz.md5.check pbench-user-benchmark_ndk-test-1_2018.05.23T03.21.32.tar.xz.md5
6364
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-34.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ user_script = sleep
105105
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
106106
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:unittests:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
107107
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
108+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
108109
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
109110
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5.check && mv pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5.check pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5
110111
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-37.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ user_script = sleep
5757
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:unittests:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
60+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6061
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check && mv pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5
6263
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-38.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ user_script = sleep
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:my-controller.example.com:unittests:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
6060
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
61+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/my-controller.example.com
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/my-controller.example.com pbench@server.com:/foo/bar
6263
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/my-controller.example.com; md5sum --check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check && mv pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5
6364
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-39.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ user_script = sleep
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:unittests:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
6060
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
61+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6263
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_ndk-test-1_2019.09.27T14.21.31.tar.xz.md5.check && mv pbench-user-benchmark_ndk-test-1_2019.09.27T14.21.31.tar.xz.md5.check pbench-user-benchmark_ndk-test-1_2019.09.27T14.21.31.tar.xz.md5
6364
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-40.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ user_script = sleep
5757
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:pap:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
60+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6061
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_pap-test-1_2019.09.27T14.21.32.tar.xz.md5.check && mv pbench-user-benchmark_pap-test-1_2019.09.27T14.21.32.tar.xz.md5.check pbench-user-benchmark_pap-test-1_2019.09.27T14.21.32.tar.xz.md5
6263
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-41.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ user_script = sleep
5757
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:unittests:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
60+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6061
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check && mv pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5.check pbench-user-benchmark_rht-test-1_2019.09.27T14.21.33.tar.xz.md5
6263
--- test-execution.log file contents

agent/util-scripts/gold/pbench-copy-results/test-49.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ user_script = sleep
5858
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:ndk20%:pbench-copy-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
6060
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
61+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6162
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-copy-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6263
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_ndk-test30%-1_2018.05.23T03.21.32.tar.xz.md5.check && mv pbench-user-benchmark_ndk-test30%-1_2018.05.23T03.21.32.tar.xz.md5.check pbench-user-benchmark_ndk-test30%-1_2018.05.23T03.21.32.tar.xz.md5
6364
--- test-execution.log file contents

agent/util-scripts/gold/pbench-move-results/test-33.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ user_script = sleep
5959
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/yum info installed pbench-agent
6060
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/curl -s -A pbench-agent-unknown-unknown:testhost.example.com:nobody:testhost.example.com:unittests:pbench-move-results -L http://pbench.example.com/pbench-results-host-info.versioned/pbench-results-host-info.URL002
6161
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com exit
62+
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com mkdir -p /foo/bar/testhost.example.com
6263
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/scp -r -o BatchMode=yes -o StrictHostKeyChecking=no -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa /var/tmp/pbench-test-utils/pbench/tmp/pbench-move-results.NNNNN/testhost.example.com pbench@server.com:/foo/bar
6364
/var/tmp/pbench-test-utils/opt/pbench-agent/unittest-scripts/ssh -n -i /var/tmp/pbench-test-utils/opt/pbench-agent/id_rsa -o BatchMode=yes -o StrictHostKeyChecking=no pbench@server.com cd /foo/bar/testhost.example.com; md5sum --check pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5.check && mv pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5.check pbench-user-benchmark_ndk-test-1_2019.01.01T12.00.42.tar.xz.md5
6465
--- test-execution.log file contents

agent/util-scripts/pbench-copy-result-tb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ fi
6565
# foo.tar.xz.md5.check file to foo.tar.xz.md5. That's the signal that the
6666
# agent has finished with this tarball.
6767

68+
controller=$(basename ${controller_dir})
69+
ssh -n -i ${pbench_bin}/id_rsa ${ssh_opts} ${results_repo} "mkdir -p ${results_path_prefix}/${controller}"
6870
scp -r ${scp_opts} -i ${pbench_bin}/id_rsa ${controller_dir} ${results_repo}:${results_path_prefix}
6971
if [[ ${?} -ne 0 ]]; then
7072
error_log "ERROR: unable to copy results tarball, ${tarball}, to ${results_repo}:${results_path_prefix}"
@@ -73,7 +75,6 @@ fi
7375

7476
# Verify the remotely copied bits are good
7577
md5name=$(basename ${tarball}).md5
76-
controller=$(basename ${controller_dir})
7778
ssh -n -i ${pbench_bin}/id_rsa ${ssh_opts} ${results_repo} "cd ${results_path_prefix}/${controller}; md5sum --check ${md5name}.check && mv ${md5name}.check ${md5name}"
7879
chk_res=${?}
7980
if [[ ${chk_res} -ne 0 ]]; then

0 commit comments

Comments
 (0)