diff --git a/.travis.yml b/.travis.yml index 988ef0eb14b66b07b454302d6b5d141df9907171..47d5647b609151dd8a5d1b4925c881573f9543db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ group: beta env: global: - VBOX_MEMORY=2048 + - VBOX_HWVIRTEX=off matrix: - TOXENV=pre-commit - TOXENV=openbsd60 diff --git a/meta/main.yml b/meta/main.yml index e2ed2f797d6bf59047d05adbdeca9ff140340325..5e4fe3601646f4791b01888c65c66cb5fe4eb1f6 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -3,7 +3,7 @@ galaxy_info: description: Provision PHP FastCGI (FPM) company: Shore technologies license: MIT - min_ansible_version: 2.0 + min_ansible_version: 2.3 platforms: - name: OpenBSD versions: diff --git a/molecule.yml b/molecule.yml index 3707dc98daaf110dab56fd9cad8f5ba9d4a8822f..9b00be56a048a5e9afd2e2e0a54443f9e5c50df8 100644 --- a/molecule.yml +++ b/molecule.yml @@ -42,6 +42,6 @@ vagrant: - 'landrush_ip.override = false if Vagrant.has_plugin?("landrush")' - | vm.provider "virtualbox" do |v| - v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", "off"] + v.customize "pre-boot", ["modifyvm", :id, "--hwvirtex", ENV['VBOX_HWVIRTEX']] if ENV.has_key?('VBOX_HWVIRTEX') v.memory = ENV['VBOX_MEMORY'].to_i if ENV.has_key?('VBOX_MEMORY') end diff --git a/tasks/main.yml b/tasks/main.yml index c2996383c78270bff95db58c13ecb28844e1f269..54507dc7ac3685a8764be477c1e3a92896db7a69 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -11,7 +11,7 @@ - ansible_os_family in php_fpm_validate_config - ansible_os_family in php_fpm_pools_dir - ansible_os_family in php_fpm_user - - ansible_distribution_release in ['jessie', 'trusty'] or ansible_distribution_version in ['6.0'] + - ansible_distribution_release in ['precise', 'wheezy', 'jessie', 'trusty'] or ansible_distribution_version in ['6.0'] - ansible_os_family != 'OpenBSD' or ansible_distribution_release in php_fpm_pkg_version - php_fpm_global_config is iterable - php_fpm_www_pool_config is iterable diff --git a/tests/requirements.txt b/tests/requirements.txt index c0ffb8cc7e76a09533f8b216ed2374b29e94fdff..1186c3351818f7fb407e6f449cebeea81093c7a9 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,6 +1,6 @@ ansible==2.3.0.0 testinfra==1.5.5 -molecule==1.23.2 +molecule==1.24.0 ansible-lint==3.4.12 python-vagrant==0.5.14 netaddr==0.7.19 diff --git a/tox.ini b/tox.ini index cd0873a5e0615e8dc74819f9051557d358d1d392..c8d9d8a943e2367af420b706829487e470c09b8b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] skip_install = True skipsdist = True -envlist = openbsd60,xenial,trusty,precise,stretch,jessie,wheezy +envlist = openbsd60,trusty,precise,jessie,wheezy [testenv] -envdir = {toxinidir}/.tox +envdir = {toxinidir}/.tox/molecule deps = -rtests/requirements.txt passenv = HOME VBOX* ANSIBLE_* whitelist_externals = @@ -14,7 +14,6 @@ commands = molecule test --platform {envname} [testenv:pre-commit] -envdir = {toxinidir}/.tox deps = -rtests/requirements.txt pre-commit