diff options
Diffstat (limited to 'jjb/dovetail')
| -rw-r--r-- | jjb/dovetail/dovetail-ci-jobs.yml | 14 | ||||
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 7 |
2 files changed, 18 insertions, 3 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml index 91362ef3a..1dd1795cb 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yml +++ b/jjb/dovetail/dovetail-ci-jobs.yml @@ -17,12 +17,14 @@ master: &master stream: master branch: '{stream}' + dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' colorado: &colorado stream: colorado branch: 'stable/{stream}' - gs-pathname: '{stream}' + dovetail-branch: master + gs-pathname: '/{stream}' docker-tag: 'latest' #----------------------------------- @@ -131,7 +133,7 @@ - string: name: DOCKER_TAG default: '{docker-tag}' - description: 'Tag to pull docker image' + description: 'Tag to pull dovetail docker image' - string: name: CI_DEBUG default: 'true' @@ -141,7 +143,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: '{branch}' + branch: '{dovetail-branch}' builders: - description-setter: @@ -149,6 +151,12 @@ - 'dovetail-cleanup' - 'dovetail-{testsuite}' + publishers: + - archive: + artifacts: 'results/**/*' + allow-empty: true + fingerprint: true + ######################## # builder macros ######################## diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index 5653d3e9e..3f7a47bee 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -42,7 +42,14 @@ echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}" 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" +echo "Dovetail: store results..." +sudo cp -r /home/opnfv/dovetail/results ./ +#To make sure the file owner is jenkins, for the copied results files in the above line +#if not, there will be error when next time to wipe workspace +sudo chown -R jenkins:jenkins ${WORKSPACE}/results + echo "Dovetail: done!" |