tests: allow setting fetch_directory with an environment variable

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
pull/1385/head
Andrew Schoen 2017-03-20 16:22:07 -05:00
parent fc54ee2f87
commit 2967023ea9
1 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ commands=
cp {toxinidir}/infrastructure-playbooks/purge-cluster.yml {toxinidir}/purge-cluster.yml cp {toxinidir}/infrastructure-playbooks/purge-cluster.yml {toxinidir}/purge-cluster.yml
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml -e ireallymeanit=yes --extra-vars '\ ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml -e ireallymeanit=yes --extra-vars '\
\{\ \{\
"fetch_directory":"{changedir}/fetch",\ "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
"ceph_rhcs":{env:CEPH_RHCS:false},\ "ceph_rhcs":{env:CEPH_RHCS:false},\
"ceph_origin":"{env:CEPH_ORIGIN:upstream}",\ "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
"ceph_dev":{env:CEPH_DEV:false},\ "ceph_dev":{env:CEPH_DEV:false},\
@ -23,7 +23,7 @@ commands=
# set up the cluster again # set up the cluster again
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars '\ ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars '\
\{\ \{\
"fetch_directory":"{changedir}/fetch",\ "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
"ceph_rhcs":{env:CEPH_RHCS:false},\ "ceph_rhcs":{env:CEPH_RHCS:false},\
"ceph_origin":"{env:CEPH_ORIGIN:upstream}",\ "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
"ceph_dev":{env:CEPH_DEV:false},\ "ceph_dev":{env:CEPH_DEV:false},\
@ -43,7 +43,7 @@ commands=
cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml -e ireallymeanit=yes --extra-vars '\ ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml -e ireallymeanit=yes --extra-vars '\
\{\ \{\
"fetch_directory":"{changedir}/fetch",\ "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
"ceph_rhcs":{env:CEPH_RHCS:false},\ "ceph_rhcs":{env:CEPH_RHCS:false},\
"ceph_origin":"{env:CEPH_ORIGIN:upstream}",\ "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
"ceph_dev":{env:CEPH_DEV:false},\ "ceph_dev":{env:CEPH_DEV:false},\
@ -100,7 +100,7 @@ commands=
ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars '\ ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars '\
\{\ \{\
"fetch_directory":"{changedir}/fetch",\ "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
"ceph_rhcs":{env:CEPH_RHCS:false},\ "ceph_rhcs":{env:CEPH_RHCS:false},\
"ceph_origin":"{env:CEPH_ORIGIN:upstream}",\ "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
"ceph_dev":{env:CEPH_DEV:false},\ "ceph_dev":{env:CEPH_DEV:false},\