diff options
author | JingLu5 <lvjing5@huawei.com> | 2017-07-11 02:34:41 +0000 |
---|---|---|
committer | JingLu5 <lvjing5@huawei.com> | 2017-07-17 07:17:58 +0000 |
commit | 8ffbb26f5150f2ecdce44100c126cf6c183933cd (patch) | |
tree | 93e57a22f7fe5b8e165bb02b4728cac4ec27813f /tests/ci/prepare_env.sh | |
parent | 7ee54db221fbb4173de011585a425f0750dd6ccf (diff) |
Open storperf testcase to huawei-pod2
JIRA: YARDSTICK-712
Change-Id: If91c936a3a59580a987cb6762db5d063edf6c9d7
Signed-off-by: JingLu5 <lvjing5@huawei.com>
Diffstat (limited to 'tests/ci/prepare_env.sh')
-rwxr-xr-x | tests/ci/prepare_env.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index 3d9cc298f..c3ee4c76b 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -11,7 +11,7 @@ # Perepare the environment to run yardstick ci : ${DEPLOY_TYPE:='bm'} # Can be any of 'bm' (Bare Metal) or 'virt' (Virtual) - +: ${INSTALLER_TYPE:='unknown'} : ${NODE_NAME:='unknown'} : ${EXTERNAL_NETWORK:='admin_floating_net'} @@ -61,9 +61,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 -if [ "$NODE_NAME" == "huawei-pod1" ]; then - bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh +# copy Storperf related files to the deployment location +if [ "$INSTALLER_TYPE" == "compass" ]; then + source $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh fi # Fetching id_rsa file from jump_server..." |