diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-10-14 07:03:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-10-14 07:03:30 +0000 |
| commit | 2fac7e7d6c86fd5129ed887399d34fc4237e6f9b (patch) | |
| tree | 1288147f3337f29b4092d42d16a354a32a147cc2 | |
| parent | 31816f33014bf05a81ca2301a634c7376927876e (diff) | |
| parent | cfd1ea69a8815e4063aea10676601ce1ab39c6af (diff) | |
Merge "dovetail tool: unittest added"
| -rw-r--r-- | jjb/dovetail/dovetail-project-jobs.yml | 35 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 2 |
2 files changed, 30 insertions, 7 deletions
diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml index bf0552251..41fd8cdcb 100644 --- a/jjb/dovetail/dovetail-project-jobs.yml +++ b/jjb/dovetail/dovetail-project-jobs.yml @@ -57,9 +57,7 @@ - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' builders: - - shell: | - echo "dovetail: verify job" - #unittest will be added future + - dovetail-unit-tests - job-template: name: 'dovetail-merge-{stream}' @@ -93,6 +91,31 @@ branch-pattern: '**/{branch}' builders: - - shell: | - echo "dovetail: merge" - #unittest will be added future + - dovetail-unit-tests + +################################ +#builders for dovetail project +############################### +- builder: + name: dovetail-unit-tests + builders: + - shell: | + #!/bin/bash + set -o errexit + set -o pipefail + + echo "Running unit tests..." + cd $WORKSPACE + virtualenv $WORKSPACE/dovetail_venv + source $WORKSPACE/dovetail_venv/bin/activate + + #packages installation + easy_install -U setuptools + easy_install -U pip + pip install -r unittests/requirements.txt + pip install -e . + + #unit tests + /bin/bash $WORKSPACE/unittests/unittest.sh + + deactivate diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index f7a965575..098b7db0c 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -48,7 +48,7 @@ docker pull opnfv/dovetail:$DOCKER_TAG >$redirect # Run docker echo "Dovetail: docker running..." sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/dovetail:${DOCKER_TAG} \ -"/home/opnfv/dovetail/scripts/run.py" +"/home/opnfv/dovetail/dovetail/run.py" echo "Dovetail: store results..." sudo cp -r /home/opnfv/dovetail/results ./ |