vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Faster venv-ansible-playbook.sh

Browse source 
If running a playbook more than once, there's no need to re-bootstrap
the virtual environment.  Assume if the verified crio directory already
exists, it should be used (after re-asserting hashes of requirements).

Signed-off-by: Chris Evich <cevich@redhat.com>
This commit is contained in:
Chris Evich 2017-09-20 15:15:08 -04:00
parent d153815f74
commit 29c4d890c8
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
contrib/test/venv-ansible-playbook.sh
View file

@ -56,6 +56,8 @@ echo
( (
set -x set -x
cd "$WORKSPACE" cd "$WORKSPACE"
# When running more than once, make it fast by skipping the bootstrap
if [ ! -d "./.cri-o_venv" ]; then
# N/B: local system's virtualenv binary - uncontrolled version fixed below # N/B: local system's virtualenv binary - uncontrolled version fixed below
virtualenv --no-site-packages --python=python2.7 ./.venvbootstrap virtualenv --no-site-packages --python=python2.7 ./.venvbootstrap
# Set up paths to install/operate out of $WORKSPACE/.venvbootstrap # Set up paths to install/operate out of $WORKSPACE/.venvbootstrap
@ -76,7 +78,7 @@ echo
./.venvbootstrap/bin/virtualenv --no-site-packages --python=python2.7 ./.cri-o_venv ./.venvbootstrap/bin/virtualenv --no-site-packages --python=python2.7 ./.cri-o_venv
# Exit untrusted virtualenv # Exit untrusted virtualenv
deactivate deactivate
fi
# Enter trusted virtualenv # Enter trusted virtualenv
source ./.cri-o_venv/bin/activate source ./.cri-o_venv/bin/activate
# Re-install from cache # Re-install from cache