Switch travis to 16.04

johnramsden · Jan 2, 2019 · 021a899 · 021a899
1 parent 227ed97
commit 021a899
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 language: python
 python:
   - "3.6"
+  - "3.7"
 
 env:
   global:
@@ -14,7 +15,7 @@ cache:
   custom_install: true
 
 before_install:
-  - sudo scripts/travis/ubuntu-14_04/setup_zfs_requirements.sh
+  - sudo scripts/travis/ubuntu/setup_zfs_requirements.sh
   - sudo scripts/travis/common/create_test_root.sh
 
 branches:

diff --git a/scripts/travis/ubuntu-14_04/setup_zfs_requirements.sh b/scripts/travis/ubuntu-14_04/setup_zfs_requirements.sh
diff --git a/scripts/travis/ubuntu/setup_zfs_requirements.sh b/scripts/travis/ubuntu/setup_zfs_requirements.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Travis setup script (16.04
+
+# Install zfs requirements
+add-apt-repository -y ppa:jonathonf/zfs && \
+apt-get -q update && \
+apt-get install -y linux-headers-$(uname -r) && \
+apt-get install -y spl-dkms zfs-dkms zfsutils-linux || exit 1