From d6fbc929a1cd4e36525e76811383fdfc039981fa Mon Sep 17 00:00:00 2001
From: "James O. D. Hunt" <james.o.hunt@intel.com>
Date: Thu, 20 Jun 2019 12:20:17 +0100
Subject: [PATCH] CI: Fix Travis and CI setup

Make the CI setup script call the "master" `setup.sh` script (in the
`tests` repo) and update the Travis config accordingly to ensure that
both setup and static checks are run.

Also updated Travis to use Ubuntu 16.04 LTS (Xenial).

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
---
 .ci/setup.sh | 8 +++++++-
 .travis.yml  | 7 +++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.ci/setup.sh b/.ci/setup.sh
index a9d5eafd2..8de81da83 100755
--- a/.ci/setup.sh
+++ b/.ci/setup.sh
@@ -8,4 +8,10 @@
 set -e
 
 cidir=$(dirname "$0")
-bash "${cidir}/static-checks.sh"
+source "${cidir}/lib.sh"
+
+clone_tests_repo
+
+pushd "${tests_repo_dir}"
+.ci/setup.sh
+popd
diff --git a/.travis.yml b/.travis.yml
index 7548bfb12..6faf652d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
 #
 
 sudo: required
-dist: trusty
+dist: xenial
 
 language: go
 os:
@@ -15,8 +15,11 @@ os:
 go:
   - "1.10.x"
 
-before_script:
+before_install:
   - ".ci/setup.sh"
 
+before_script:
+  - ".ci/static-checks.sh"
+
 script:
   - ".ci/run.sh"