From 077ddbc85a9dc1101b8cc0a036e7b20222ebfb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= Date: Sat, 14 May 2016 07:37:13 -0500 Subject: [PATCH] Issue #616: Switch travis tests from Ubuntu 14.04 to 16.04 --- .travis.yml | 6 +++--- tests/{Dockerfile.ubuntu-14.04 => Dockerfile.ubuntu-16.04} | 2 +- tests/{ubuntu-14-nginx.yml => ubuntu-16-nginx.yml} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename tests/{Dockerfile.ubuntu-14.04 => Dockerfile.ubuntu-16.04} (95%) rename tests/{ubuntu-14-nginx.yml => ubuntu-16-nginx.yml} (100%) diff --git a/.travis.yml b/.travis.yml index 31a0e0ff6..25b0ca25f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,14 @@ env: IP: 192.168.88.88 matrix: - distribution: ubuntu - version: 14.04 + version: 16.04 init: /sbin/init run_opts: "--privileged" - distribution: ubuntu - version: 14.04 + version: 16.04 init: /sbin/init run_opts: "--privileged" - additional_vars: ubuntu-14-nginx.yml + additional_vars: ubuntu-16-nginx.yml - distribution: centos version: 7 init: /usr/lib/systemd/systemd diff --git a/tests/Dockerfile.ubuntu-14.04 b/tests/Dockerfile.ubuntu-16.04 similarity index 95% rename from tests/Dockerfile.ubuntu-14.04 rename to tests/Dockerfile.ubuntu-16.04 index 266f96287..443cc58b2 100644 --- a/tests/Dockerfile.ubuntu-14.04 +++ b/tests/Dockerfile.ubuntu-16.04 @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 RUN apt-get update # Install Ansible diff --git a/tests/ubuntu-14-nginx.yml b/tests/ubuntu-16-nginx.yml similarity index 100% rename from tests/ubuntu-14-nginx.yml rename to tests/ubuntu-16-nginx.yml