diff options
author | JingLu5 <lvjing5@huawei.com> | 2016-08-18 14:53:37 +0800 |
---|---|---|
committer | JingLu5 <lvjing5@huawei.com> | 2016-08-18 15:05:13 +0800 |
commit | d6e9b4b60c448ec9041febda29e9260eef9cb52a (patch) | |
tree | 24f23297d16501ec19c78e5c36ea8a6ba184edea | |
parent | 63f0e9d0f314e7cf8826604cdd2ffd0b2cb35c9b (diff) |
BugFix: fix storperf_admin-rc problem
Change-Id: I187e3e00d38745288f6fccd58ee6bd3d3aea06c9
Signed-off-by: JingLu5 <lvjing5@huawei.com>
-rw-r--r-- | tests/ci/docker/yardstick-ci/Dockerfile | 1 | ||||
-rwxr-xr-x | tests/ci/prepare_env.sh | 3 | ||||
-rw-r--r-- | tests/ci/scp_storperf_admin-rc.sh | 7 |
3 files changed, 11 insertions, 0 deletions
diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/tests/ci/docker/yardstick-ci/Dockerfile index 684f47122..da755d11d 100644 --- a/tests/ci/docker/yardstick-ci/Dockerfile +++ b/tests/ci/docker/yardstick-ci/Dockerfile @@ -20,6 +20,7 @@ ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN apt-get update && apt-get install -y \ wget \ + expect \ curl \ git \ sshpass \ diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index 35118b12c..cb83d9cb3 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -56,6 +56,9 @@ export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME # Prepare a admin-rc file for StorPerf integration $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh +# copy a admin-rc file for StorPerf integration to the deployment location +expect $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh + # Fetching id_rsa file from jump_server..." verify_connectivity() { local ip=$1 diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_admin-rc.sh new file mode 100644 index 000000000..fd94aaa17 --- /dev/null +++ b/tests/ci/scp_storperf_admin-rc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/expect +set timeout 30 + +spawn scp -o StrictHostKeyChecking=no /root/storperf_admin-rc root@192.168.200.1:/root/storperf_admin-rc +expect "root@192.168.200.1's password: " +send "root\r" +interact |