From cef6357487dc76477aabeeaa40e0faeed3f286a3 Mon Sep 17 00:00:00 2001 From: Matthias Baur Date: Tue, 15 Jan 2019 12:23:14 +0100 Subject: [PATCH] Officially support Ubuntu 18.04 Fixes #757. --- .travis.yml | 15 +++++++++++++++ metadata.json | 3 ++- spec/spec_helper_acceptance.rb | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4deec2271..31726a284 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,6 +82,21 @@ matrix: env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker services: docker sudo: required + - rvm: 2.5.1 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + sudo: required + - rvm: 2.5.1 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + sudo: required + - rvm: 2.5.1 + bundler_args: --without development release + env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6-nightly BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker + services: docker + sudo: required - rvm: 2.5.1 bundler_args: --without development release env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker diff --git a/metadata.json b/metadata.json index 900498749..22e079396 100644 --- a/metadata.json +++ b/metadata.json @@ -33,7 +33,8 @@ "operatingsystem": "Ubuntu", "operatingsystemrelease": [ "14.04", - "16.04" + "16.04", + "18.04" ] }, { diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index aaf76a04a..96a5323f8 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -18,7 +18,7 @@ c.formatter = :documentation c.before :suite do hosts.each do |host| - install_package(host, 'iproute2') if fact('os.release.major').to_i == 18 + install_package(host, 'iproute2') if fact('os.release.major').to_i == 18 || fact('os.release.major') == 'buster/sid' if fact('os.family') == 'RedHat' && fact('selinux') == 'true' # Make sure selinux is disabled so the tests work. on host, puppet('apply', '-e',