bugfix about sut

1. currently experimental job only runs against vnf
2. bugfix: for qtip  Renaming a container with the
same name as its current name
3. update quickstart.sh usage

Change-Id: I363fcfdb4199b3ddc408fdf3c54b11cdf62fa728
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>

4 files changed, 13 insertions, 11 deletions

diff --git a/qtip/scripts/quickstart.sh b/qtip/scripts/quickstart.sh
index f9becda8..22257f5b 100644
--- a/qtip/scripts/quickstart.sh
+++ b/qtip/scripts/quickstart.sh
@@ -13,7 +13,8 @@ set -o pipefail
 set -x
 
 usage(){
-   echo "usage: $0 -q <qtip_test_suite> -t <installer_type> -i <installer_ip> -p <pod_name> -s <scenario> -r <report_url>" >&2
+   echo "usage: $0 -q <qtip_test_suite> -t <installer_type> -i <installer_ip> -p <pod_name> -s <scenario> -r <report_url>
+   -u <sut>" >&2
 }
 
 verify_connectivity(){
@@ -56,7 +57,7 @@ test_suite=${test_suite:-$TEST_SUITE}
 pod_name=${pod_name:-$NODE_NAME}
 scenario=${scenario:-$SCENARIO}
 testapi_url=${testapi_url:-$TESTAPI_URL}
-sut=${sut:-host}
+sut=${sut:-node}
 
 # we currently support fuel, apex and mcp
 if [[ ! "$installer_type" =~ (fuel|apex|mcp) ]]; then
@@ -78,9 +79,9 @@ esac
 cd /home/opnfv
 
 qtip create --project-template ${test_suite} --pod-name ${pod_name} --installer-type ${installer_type} \
---installer-host ${installer_ip} --scenario ${scenario} --sut ${sut} ${test_suite}-${sut}
+--installer-host ${installer_ip} --scenario ${scenario} --sut ${sut} ${test_suite}
 
-cd ${test_suite}-${sut}
+cd ${test_suite}
 
 qtip setup
 eval `ssh-agent`
diff --git a/tests/ci/compute/docker-compose.yaml b/tests/ci/compute/docker-compose.yaml
index 712c9c54..b6bdf13d 100644
--- a/tests/ci/compute/docker-compose.yaml
+++ b/tests/ci/compute/docker-compose.yaml
@@ -11,7 +11,7 @@ version: '2'
 services:
 
   qtip:
-    container_name: compute_qtip
+    container_name: compute_qtip_${SUT}
     image: opnfv/qtip:${DOCKER_TAG}
     env_file: ${ENV_FILE}
     volumes:
diff --git a/tests/ci/experimental.sh b/tests/ci/experimental.sh
index 53de1db4..e45611e5 100755
--- a/tests/ci/experimental.sh
+++ b/tests/ci/experimental.sh
@@ -21,17 +21,18 @@ export TEST_SUITE='compute'
 export TESTAPI_URL=''
 export SSH_CREDENTIALS='/root/.ssh'
 export WORKSPACE=${WORKSPACE:-$(pwd)}
+export SUT='vnf'
 
 source ${script_dir}/utils/start_services.sh
 
 cd ${WORKSPACE}
 
 qtip_repo='/home/opnfv/repos/qtip'
-docker cp . ${TEST_SUITE}_qtip:${qtip_repo}
-docker exec ${TEST_SUITE}_qtip bash -c "cd ${qtip_repo} && pip install -U -e ."
+docker cp . ${TEST_SUITE}_qtip_${SUT}:${qtip_repo}
+docker exec ${TEST_SUITE}_qtip_${SUT} bash -c "cd ${qtip_repo} && pip install -U -e ."
 
-docker exec ${TEST_SUITE}_qtip bash -x ${qtip_repo}/qtip/scripts/quickstart.sh -u {SUT}
+docker exec ${TEST_SUITE}_qtip_${SUT} bash -x ${qtip_repo}/qtip/scripts/quickstart.sh -u "${SUT}"
 
-echo "QTIP: Verify ${TEST_SUITE} on ${SUT} done!"
+echo "QTIP: Verify ${TEST_SUITE} done!"
 
 exit 0
diff --git a/tests/ci/periodic.sh b/tests/ci/periodic.sh
index 5bbdf517..e37f236e 100755
--- a/tests/ci/periodic.sh
+++ b/tests/ci/periodic.sh
@@ -13,8 +13,8 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source ${script_dir}/utils/start_services.sh
 
-docker exec ${TEST_SUITE}_qtip bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh -u ${SUT}
+docker exec ${TEST_SUITE}_qtip_${SUT} bash -x /home/opnfv/repos/qtip/qtip/scripts/quickstart.sh -u "${SUT}"
 
-echo "${TEST_SUITE} QPI on ${SUT} done!"
+echo "${TEST_SUITE} QPI done!"
 
 exit 0