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 | |
| 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')
| -rwxr-xr-x | tests/ci/prepare_env.sh | 8 | ||||
| -rw-r--r-- | tests/ci/scp_storperf_files.sh | 21 | ||||
| -rwxr-xr-x | tests/ci/yardstick-verify | 4 |
3 files changed, 24 insertions, 9 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..." diff --git a/tests/ci/scp_storperf_files.sh b/tests/ci/scp_storperf_files.sh index 234032cf1..ffcc710cb 100644 --- a/tests/ci/scp_storperf_files.sh +++ b/tests/ci/scp_storperf_files.sh @@ -12,9 +12,24 @@ # Copy storperf_admin-rc to deployment location. ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" + +case "$NODE_NAME" in + "huawei-pod1") + JUMP_HOST_IP='192.168.10.6' + ;; + "huawei-pod2") + JUMP_HOST_IP='192.168.11.2' + ;; + *) + # no node name, exit + exit 1 + ;; +esac +export JUMP_HOST_IP + sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ - root@192.168.10.6:/root/ &> /dev/null + root@${JUMP_HOST_IP}:/root/ &> /dev/null sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/docker-compose.yaml \ - root@192.168.10.6:/root/ &> /dev/null + root@${JUMP_HOST_IP}:/root/ &> /dev/null sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/nginx.conf \ - root@192.168.10.6:/root/ &> /dev/null + root@${JUMP_HOST_IP}:/root/ &> /dev/null diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 096ea534f..751cf65f3 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -100,7 +100,7 @@ set -o pipefail install_storperf() { # Install Storper on huawei-pod1 - if [ "$NODE_NAME" == "huawei-pod1" ]; then + if [ "$INSTALLER_TYPE" == "compass" ]; then echo echo "========== Installing storperf ==========" @@ -115,7 +115,7 @@ install_storperf() remove_storperf() { # remove Storper from huawei-pod1 - if [ "$NODE_NAME" == "huawei-pod1" ]; then + if [ "$INSTALLER_TYPE" == "compass" ]; then echo echo "========== Removing storperf ==========" |