Merge pull request #1 from nlevitt/travis-docker

more fiddling with travis/docker
This commit is contained in:
Noah Levitt 2015-10-02 16:50:09 -07:00
commit d24f2d8036
2 changed files with 15 additions and 12 deletions

View File

@ -1,15 +1,18 @@
sudo: required
language: python
python:
- 2.7
- 3.4
- 3.5
- 3.4
- 2.7
- nightly
- pypy
- pypy3
services:
- docker
before_install:
- docker build -t internetarchive/rethinkdb tests
- sudo service docker restart ; sleep 10 # https://github.com/travis-ci/travis-ci/issues/4778
- docker run -d --publish=28015:28015 rethinkdb
install:
- pip install . pytest
script:
- docker run --rm -i -t --volume="..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- bash -x -c "cd /rethinkstuff && virtualenv -p $python /tmp/venv && source /tmp/venv/bin/activate && pip install pytest . && py.test -v -s tests"
- py.test -v -s tests

View File

@ -9,12 +9,12 @@ user=$(id -un)
for python in python2.7 python3.4
do
docker run --rm -i -t --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
bash -x -c "adduser --gecos=$user --disabled-password --quiet --uid=$uid $user \
&& sudo -u $user bash -x -c 'cd /rethinkstuff \
&& virtualenv -p $python /tmp/venv \
&& source /tmp/venv/bin/activate \
&& pip install pytest . \
&& py.test -v -s tests'"
docker run -i --rm --volume="$script_dir/..:/rethinkstuff" internetarchive/rethinkdb /sbin/my_init -- \
true < /dev/null
# bash -x -c "cd /rethinkstuff \
# && virtualenv -p $python /tmp/venv \
# && source /tmp/venv/bin/activate \
# && pip install pytest . \
# && py.test -v -s tests"
done