diff --git a/.travis.yml b/.travis.yml index 5337b1a..0550811 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,9 +18,6 @@ env: - distro: ubuntu1404 playbook: test.yml php_version: 7.0 - - distro: ubuntu1204 - playbook: test.yml - php_version: 5.6 # Only test source install on latest supported OSes. - distro: centos7 diff --git a/meta/main.yml b/meta/main.yml index 44ec3c8..b750632 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -20,7 +20,15 @@ galaxy_info: - all - name: Ubuntu versions: - - all + - trusty + - xenial galaxy_tags: - development - web + - php + - language + - fpm + - drupal + - wordpress + - joomla + - magento diff --git a/tests/test-vars-ubuntu1204.yml b/tests/test-vars-ubuntu1204.yml deleted file mode 100644 index 49c96b8..0000000 --- a/tests/test-vars-ubuntu1204.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -php_packages: - - php5.6 - - php5.6-mcrypt - - php5.6-cli - - php5.6-common - - php5.6-curl - - php5.6-dev - - php5.6-fpm - - php5.6-gd - - libpcre3-dev -php_conf_paths: - - /etc/php/5.6/fpm - - /etc/php/5.6/apache2 - - /etc/php/5.6/cli -php_extension_conf_paths: - - /etc/php/5.6/fpm/conf.d - - /etc/php/5.6/apache2/conf.d - - /etc/php/5.6/cli/conf.d -php_fpm_daemon: php5.6-fpm -php_fpm_conf_path: "/etc/php/5.6/fpm" diff --git a/tests/test.yml b/tests/test.yml index baaa790..ff72fc3 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -15,16 +15,9 @@ changed_when: false # Ubuntu-specific tasks. - - include_vars: test-vars-ubuntu1204.yml - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04' - - name: Add repository for PHP 7. apt_repository: repo='ppa:ondrej/php' - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version != '12.04' - - - name: Add repository for PHP 5.6. - apt_repository: repo='ppa:ondrej/php' - when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '12.04' + when: ansible_distribution == 'Ubuntu' # Debian-specific tasks. - name: Add dependencies for PHP versions (Debian).