From 2101eff05a129c66f038c19f3178840f56fad845 Mon Sep 17 00:00:00 2001
From: Sergei Morozov <morozov@tut.by>
Date: Mon, 22 Apr 2019 18:48:35 -0700
Subject: [PATCH] Switching Travis CI builds to Ubuntu Xenial Xerus

---
 .travis.yml                                 | 20 +++++---------------
 tests/travis/install-sqlsrv-dependencies.sh |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e0d87665991..984e55549d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 sudo: false
-dist: trusty
+dist: xenial
 
 cache:
     directories:
@@ -116,6 +116,8 @@ jobs:
     - stage: Test
       php: 7.3
       env: DB=mysql COVERAGE=yes
+      services:
+        - mysql
     - stage: Test
       php: 7.3
       env: DB=mysql.docker MYSQL_VERSION=5.7 COVERAGE=yes
@@ -133,6 +135,8 @@ jobs:
     - stage: Test
       php: 7.3
       env: DB=mysqli COVERAGE=yes
+      services:
+        - mysql
     - stage: Test
       php: 7.3
       env: DB=mysqli.docker MYSQL_VERSION=5.7 COVERAGE=yes
@@ -190,46 +194,32 @@ jobs:
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.2 COVERAGE=yes
-      services:
-        - postgresql
       addons:
         postgresql: "9.2"
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.3 COVERAGE=yes
-      services:
-        - postgresql
       addons:
         postgresql: "9.3"
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.4 COVERAGE=yes
-      services:
-        - postgresql
       addons:
         postgresql: "9.4"
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.5 COVERAGE=yes
-      services:
-        - postgresql
       addons:
         postgresql: "9.5"
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=9.6 COVERAGE=yes
-      services:
-        - postgresql
       addons:
         postgresql: "9.6"
     - stage: Test
       php: 7.3
       env: DB=pgsql POSTGRESQL_VERSION=10.0 COVERAGE=yes
       sudo: required
-      services:
-        - postgresql
-      addons:
-        postgresql: "9.6"
       before_script:
         - bash ./tests/travis/install-postgres-10.sh
     - stage: Test
diff --git a/tests/travis/install-sqlsrv-dependencies.sh b/tests/travis/install-sqlsrv-dependencies.sh
index 137b2a95705..ff91bfdfaf0 100644
--- a/tests/travis/install-sqlsrv-dependencies.sh
+++ b/tests/travis/install-sqlsrv-dependencies.sh
@@ -5,6 +5,6 @@ set -ex
 echo Installing driver dependencies
 
 curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
-curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql.list
+curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql.list
 sudo apt-get update
 ACCEPT_EULA=Y sudo apt-get install -qy msodbcsql17 unixodbc unixodbc-dev libssl1.0.0