Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
docker: Make it possible to specify tags for Docker Images of test projects
[releng.git]
/
jjb
/
functest
/
functest-ci-jobs.yml
diff --git
a/jjb/functest/functest-ci-jobs.yml
b/jjb/functest/functest-ci-jobs.yml
index
4e6634d
..
01e1885
100644
(file)
--- a/
jjb/functest/functest-ci-jobs.yml
+++ b/
jjb/functest/functest-ci-jobs.yml
@@
-13,10
+13,12
@@
stream: master
branch: '{stream}'
gs-pathname: ''
stream: master
branch: '{stream}'
gs-pathname: ''
+ docker-tag: 'latest'
brahmaputra: &brahmaputra
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
brahmaputra: &brahmaputra
stream: brahmaputra
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ docker-tag: 'brahmaputra.1.0'
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@
-41,6
+43,9
@@
- ericsson-pod2:
installer: fuel
<<: *brahmaputra
- ericsson-pod2:
installer: fuel
<<: *brahmaputra
+ - opnfv-jump-2:
+ installer: fuel
+ <<: *brahmaputra
- virtual:
installer: fuel
<<: *brahmaputra
- virtual:
installer: fuel
<<: *brahmaputra
@@
-121,6
+126,10
@@
- string:
name: DEPLOY_SCENARIO
default: 'os-odl_l2-nofeature-ha'
- 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}'
- functest-parameter:
gs-pathname: '{gs-pathname}'
@@
-258,7
+267,7
@@
sudo rm -rf ${dir_result}/*
res_volume="-v ${dir_result}:/home/opnfv/functest/results"
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}
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}