diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2017-01-14 02:42:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-14 02:42:07 +0000 |
| commit | d8fbf3739d441c9c3388a5543bb7f6a1c282cf1d (patch) | |
| tree | 796f9ee2626f20d034f87b6c5f7b4d4e8534a6c7 | |
| parent | b2cc36d134c4e775398b2ecfbebc47161afed692 (diff) | |
| parent | d5218d7fdfee0b176d1f5e9df99e7ac3d66c1877 (diff) | |
Merge "dovetail: separate dovetail jenkins job"
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 7 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 2b6ab7621..08eb5a5f1 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -227,13 +227,6 @@ - shell: !include-raw: ./dovetail-run.sh - -- builder: - name: dovetail-fetch-os-creds - builders: - - shell: - !include-raw: ../../utils/fetch_os_creds.sh - - builder: name: dovetail-cleanup builders: diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 4cc03f7c9..0a2f156cc 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -66,9 +66,12 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then exit 1 fi -exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE} -d true" -echo "Container exec command: ${exec_cmd}" -docker exec ${container_id} ${exec_cmd} +list_cmd="dovetail list ${TESTSUITE}" +run_cmd="dovetail run --testsuite ${TESTSUITE} -d true" +echo "Container exec command: ${list_cmd}" +docker exec $container_id ${list_cmd} +echo "Container exec command: ${run_cmd}" +docker exec $container_id ${run_cmd} sudo cp -r ${DOVETAIL_REPO_DIR}/results ./ #To make sure the file owner is jenkins, for the copied results files in the above line |