diff options
Diffstat (limited to 'jjb/dovetail')
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 21 | ||||
| -rw-r--r-- | jjb/dovetail/dovetail-project-jobs.yml | 35 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 6 |
3 files changed, 55 insertions, 7 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 1dd1795cb..29212005d 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -81,6 +81,27 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *colorado +#apex CI PODs + - apex-verify-master: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - apex-daily-master: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *master + - apex-verify-colorado: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado + - apex-daily-colorado: + slave-label: '{pod}' + SUT: apex + auto-trigger-name: 'daily-trigger-disabled' + <<: *colorado #-------------------------------- # None-CI PODs #-------------------------------- 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 3f7a47bee..098b7db0c 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -34,6 +34,10 @@ fi opts="--privileged=true --rm" envs="-e CI_DEBUG=${CI_DEBUG} \ + -e INSTALLER_TYPE=${INSTALLER_TYPE} \ + -e INSTALLER_IP=${INSTALLER_IP} \ + -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ + -e DEPLOY_TYPE=${DEPLOY_TYPE} \ -v /var/run/docker.sock:/var/run/docker.sock \ -v /home/opnfv/dovetail/results:/home/opnfv/dovetail/results" @@ -44,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 ./ |