Skip to content

Commit

Permalink
Added in a thing to nuke the bogus python env to stop itest polution
Browse files Browse the repository at this point in the history
  • Loading branch information
solarkennedy committed Nov 12, 2015
1 parent 5bdf502 commit 4161ade
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -10,12 +10,14 @@ docs/source/generated/
tags
venv
.bash_history
.lesshst

# Generated debian artifacts
debian/paasta-tools/
debian/files
debian/paasta-tools.substvars
debian/paasta-tools.debhelper.log
debian/paasta-tools.postinst.debhelper

# Itest artifacts
fake_service_uno/
Expand Down
4 changes: 4 additions & 0 deletions yelp_package/itest/ubuntu.sh
Expand Up @@ -69,6 +69,9 @@ mkdir -p /etc/paasta
[ -L /etc/paasta/chronos.json ] || ln -s /work/yelp_package/itest/chronos.json /etc/paasta/chronos.json
[ -L /etc/paasta/cluster.json ] || ln -s /work/yelp_package/itest/cluster.json /etc/paasta/cluster.json

# If left there, they are included in the python path and can pollute the tests.
rm -r debian/paasta-tools/

if dpkg -i /work/dist/*.deb; then
echo "Looks like it installed correctly"
else
Expand All @@ -80,6 +83,7 @@ for scr in $SCRIPTS
do
which $scr >/dev/null || (echo "$scr failed to install!"; exit 1)
done
setup_marathon_job --help >/dev/null

for srv in $MARATHON_SERVICES
do
Expand Down

0 comments on commit 4161ade

Please sign in to comment.