Use xenial in Travis builds; update travis_install.sh

Author: acrellin

.travis.yml

@@ -35,7 +35,7 @@
 
 
 language: python
-dist: trusty
+dist: xenial
 sudo: required
 cache:
   # See http://docs.travis-ci.com/user/caching/#pip-cache
@@ -53,12 +53,13 @@ addons:
     - nodejs
     - supervisor
     - nginx
-    - xvfb
     - unzip
     - libnss3
     - libgconf-2-4
   postgresql: "9.6"
   firefox: latest
+services:
+  - xvfg
 
 matrix:
   include:
@@ -75,11 +76,10 @@ before_install:
   - source .travis/travis_funcs.sh
 
 install:
+  # Workaround for invalid GPG keys for MongoDB, CouchDB, and git-lfs
+  - sudo rm -f /etc/apt/sources.list.d/mongodb*
+  - sudo rm -f /etc/apt/sources.list.d/couchdb*
+  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 762E3157
   - .travis/travis_install.sh
 
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
-
 script: .travis/travis_script.sh

.travis/travis_install.sh

@@ -10,7 +10,10 @@ firefox --version
 # Install v1.7 or newer of nginx to support 'if' statement for logging
 sudo apt-add-repository -y ppa:nginx/development
 sudo apt update
-sudo apt install -y nginx
+sudo apt install -y nginx firefox
+
+nginx -v
+firefox --version
 
 pip install --upgrade pip
 hash -d pip  # find upgraded pip