From 3ef4228a89aeb6b3814f0b5ef89c75acfa7f382d Mon Sep 17 00:00:00 2001 From: JingLu5 Date: Wed, 5 Jul 2017 03:49:32 +0000 Subject: Yardstick install storperf update JIRA: YARDSTICK-702 Sicnce StorPerf has switched to use docker-compose to start container suite. The way Yardstick install storperf should also be updated. Change-Id: Idee05703b8ae5cd03bc214f598f56c8ac05ca755 Signed-off-by: JingLu5 --- tests/ci/prepare_env.sh | 2 +- tests/ci/scp_storperf_admin-rc.sh | 16 ---------------- tests/ci/scp_storperf_files.sh | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 tests/ci/scp_storperf_admin-rc.sh create mode 100644 tests/ci/scp_storperf_files.sh (limited to 'tests/ci') diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index e8f287bcd..3d9cc298f 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -63,7 +63,7 @@ $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_admin-rc.sh + bash $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_files.sh fi # Fetching id_rsa file from jump_server..." diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_admin-rc.sh deleted file mode 100644 index 7c3896d88..000000000 --- a/tests/ci/scp_storperf_admin-rc.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -############################################################################## -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -# Copy storperf_admin-rc to deployment location. - -ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ - root@192.168.200.1:/root/ &> /dev/null diff --git a/tests/ci/scp_storperf_files.sh b/tests/ci/scp_storperf_files.sh new file mode 100644 index 000000000..f8dce7107 --- /dev/null +++ b/tests/ci/scp_storperf_files.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Copy storperf_admin-rc to deployment location. + +ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" +sshpass -p root scp 2>/dev/null $ssh_options ~/storperf_admin-rc \ + root@192.168.200.1:/root/ &> /dev/null +sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/docker-compose.yaml \ + root@192.168.200.1:/root/ &> /dev/null +sshpass -p root scp 2>/dev/null $ssh_options /home/opnfv/repos/storperf/docker-compose/nginx.conf \ + root@192.168.200.1:/root/ &> /dev/null -- cgit 1.2.3-korg