Merge pull request #237 from jd/gnocchi-ci

Fix Gnocchi CI
cdent · Dec 22, 2017 · 0e12320 · 0e12320
2 parents 411afe7 + be6cf1a
commit 0e12320
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,25 @@
 sudo: false
 language: python
+services:
+  # For Gnocchi
+  - docker
 install:
-      - pip install tox 
+      - |
+        if [ "$TOXENV" == "gnocchi" ]; then
+            docker pull gnocchixyz/ci-tools:latest
+        else
+            pip install tox
+        fi
 script:
-      - tox
+      - |
+        case "$TOXENV" in
+            gnocchi)
+              docker run -v ~/.cache/pip:/home/tester/.cache/pip -v $(pwd):/home/tester/src gnocchixyz/ci-tools:latest tox -e ${TOXENV}
+              ;;
+            *)
+              tox
+              ;;
+        esac
 matrix:
     include:
         - env: TOXENV=py27

diff --git a/tox.ini b/tox.ini
@@ -59,9 +59,9 @@ basepython = python2.7
 deps = -egit+https://github.com/gnocchixyz/gnocchi#egg=gnocchi
        tox
 changedir = {envdir}/src/gnocchi
-commands = tox -e py27-gabbi --notest  # ensure a virtualenv is built
-           {envdir}/src/gnocchi/.tox/py27-gabbi/bin/pip install -U {toxinidir}  # install gabbi
-           tox -e py27-gabbi
+commands = tox -e py27-postgresql-file --notest  # ensure a virtualenv is built
+           {envdir}/src/gnocchi/.tox/py27-postgresql-file/bin/pip install -U {toxinidir}  # install gabbi
+           tox -e py27-postgresql-file gabbi
 
 [testenv:placement]
 basepython = python2.7