diff options
| author |   xudan <xudan16@huawei.com> | 2018-02-06 02:43:07 -0500 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-02-10 20:27:04 -0500 |
| commit | c778ca0b11edd0da11e5ec2ce449dd72621d3af7 (patch) | |
| tree | b50712b3173503edc37cad16fff4bf2e81240bfd /jjb/dovetail/dovetail-run.sh | |
| parent | 8150d3cc0157e15003cf0e6e99fcf50db386bef2 (diff) | |
[Dovetail CI] change dovetail CI jobs on Compass
1. run default test suite on Compass on Monday and Tuesday for scenario
'os-nosdn-nofeature-ha' and 'os-odl_l3-nofeature-ha'
2. run test suite 'proposed_tests' on Compass on Thursday and Friday for
scenario 'os-nosdn-nofeature-ha' and 'os-odl_l3-nofeature-ha'
JIRA: DOVETAIL-612
Change-Id: I027ca278eb63bdc6842a9494b676cdab8d2d25bf
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'jjb/dovetail/dovetail-run.sh')
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index e50242bd6..de92c1814 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -246,8 +246,6 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T sed -i 's/internal/public/g' ${OPENRC} if [[ ${public_url} =~ 'v2' ]]; then sed -i "s/OS_IDENTITY_API_VERSION=3/OS_IDENTITY_API_VERSION=2.0/g" ${OPENRC} - sed -i '/OS_PROJECT_DOMAIN_NAME/d' ${OPENRC} - sed -i '/OS_USER_DOMAIN_NAME/d' ${OPENRC} fi cat ${OPENRC} fi @@ -275,10 +273,13 @@ cp_tempest_cmd="docker cp ${DOVETAIL_CONFIG}/tempest_conf.yaml $container_id:/ho echo "exec command: ${cp_tempest_cmd}" $cp_tempest_cmd -list_cmd="dovetail list ${TESTSUITE}" -run_cmd="dovetail run --testsuite ${TESTSUITE} -d" -echo "Container exec command: ${list_cmd}" -docker exec $container_id ${list_cmd} +if [[ ${TESTSUITE} == 'default' ]]; then + testsuite= '' +else + testsuite= "--testsuite ${TESTSUITE}" +fi + +run_cmd="dovetail run ${testsuite} -d" echo "Container exec command: ${run_cmd}" docker exec $container_id ${run_cmd} |