diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-03-01 10:36:20 +0800 |
|---|---|---|
| committer | zhihui wu <wu.zhihui1@zte.com.cn> | 2018-03-01 13:12:36 +0800 |
| commit | 46b3aa5c929bdce4526b13dda59e0787c81bdf3d (patch) | |
| tree | 6d928bc7387477777230595a23df82f55bf87497 /tests/ci | |
| parent | c29e36280713aa232a19e0d3612bae0948601837 (diff) | |
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>
Diffstat (limited to 'tests/ci')
| -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 |
3 files changed, 8 insertions, 7 deletions
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 |