diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-07-24 06:55:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-24 06:55:28 +0000 |
| commit | 15d807c22f33fab8e1f9b61e1d0c041a8144ee89 (patch) | |
| tree | 6a3abbc72033ad505a80094378818aae7570a5cb /tests/ci/prepare_env.sh | |
| parent | deccb02a8adabe609c2e903ce9f60e8b39db6c29 (diff) | |
| parent | 8ffbb26f5150f2ecdce44100c126cf6c183933cd (diff) | |
Merge "Open storperf testcase to huawei-pod2"
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..." |