diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-02-23 11:44:46 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-02-25 14:17:23 +0100 |
| commit | c2433197d4fba6bea36713878cd38c3c523b4327 (patch) | |
| tree | 23ba0afcde625ebfb098ddaa8cba5496a683db58 /jjb/functest/functest-ci-jobs.yml | |
| parent | 1525a2ec04f7e592fc97d8b7d20a1870ac9312d5 (diff) | |
docker: Make it possible to specify tags for Docker Images of test projects
Also use latest for images built on master and stable for images built on stable branch.
Change-Id: I0988be86abcb2a13d8e94962b4ba1ced8778793b
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/functest/functest-ci-jobs.yml')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index e0750f338..01e1885cb 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -13,10 +13,12 @@ stream: master branch: '{stream}' gs-pathname: '' + docker-tag: 'latest' brahmaputra: &brahmaputra stream: brahmaputra branch: 'stable/{stream}' gs-pathname: '/{stream}' + docker-tag: 'brahmaputra.1.0' #-------------------------------- # POD, INSTALLER, AND BRANCH MAPPING #-------------------------------- @@ -124,6 +126,10 @@ - string: name: DEPLOY_SCENARIO default: 'os-odl_l2-nofeature-ha' + - string: + name: DOCKER_TAG + default: '{docker-tag}' + description: 'Tag to pull docker image' - functest-parameter: gs-pathname: '{gs-pathname}' @@ -261,7 +267,7 @@ sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest >$redirect + docker pull opnfv/functest:$DOCKER_TAG >$redirect cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} |