diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-03-01 05:20:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-01 05:20:00 +0000 |
| commit | 8890340e3ef985f937d4f9f3982ddb110174303c (patch) | |
| tree | a306d387cb95fdc71193c722510648bd9a443746 | |
| parent | ce37a4fa011c253465f6485dbd05f2c2e99f5109 (diff) | |
| parent | 46b3aa5c929bdce4526b13dda59e0787c81bdf3d (diff) | |
Merge "bugfix about sut"
| -rw-r--r-- | qtip/scripts/quickstart.sh | 9 | ||||
| -rw-r--r-- | tests/ci/compute/docker-compose.yaml | 2 | ||||
| -rwxr-xr-x | tests/ci/experimental.sh | 9 | ||||
| -rwxr-xr-x | tests/ci/periodic.sh | 4 |
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 |