Merge pull request #3806 from matrix-org/erikj/limit_postgres_travis

Only start postgres instance for postgres tests on Travis CI

.travis.yml

@@ -8,9 +8,6 @@ before_script:
   - git remote set-branches --add origin develop
   - git fetch origin develop
 
-services:
-  - postgresql
-
 matrix:
   fast_finish: true
   include:
@@ -25,6 +22,8 @@ matrix:
 
   - python: 2.7
     env: TOX_ENV=py27-postgres TRIAL_FLAGS="-j 4"
+    services:
+      - postgresql
 
   - python: 3.6
     env: TOX_ENV=py36

changelog.d/3806.misc

@@ -0,0 +1 @@
+Only start postgres instance for postgres tests on Travis CI