Fix travis with dotdeb (Jessie)

2016-01-22 16:57:32 +01:00 · 2016-01-22 16:57:32 +01:00 · 9711cd5d15
parent d79928e41a
commit 9711cd5d15
2 changed files with 6 additions and 3 deletions
--- a/tests/test.sh
+++ b/tests/test.sh
@ -19,7 +19,7 @@ fi
 ansible --version

 # Check syntax
-ansible-playbook -i $INVENTORY_FILE -c local --syntax-check -vv $PLAYBOOK
+ansible-playbook -i $INVENTORY_FILE -c local $ANSIBLE_ARG --syntax-check -vv $PLAYBOOK

 # Check role
 ansible-playbook -i $INVENTORY_FILE -c local $ANSIBLE_ARG --become -vv $PLAYBOOK
--- a/tests/test.yml
+++ b/tests/test.yml
@ -1,10 +1,13 @@
 ---

 # On Debian Jessie, we need Dotdeb for PHP 7.0
- hosts: php-7.0 
+- hosts: all
  roles:
    - role: HanXHX.dotdeb
-      when: ansible_distribution_major_version | version_compare(8, 'eq')
+      when: >
+        ansible_distribution_major_version | version_compare(8, 'eq') and
+        php_version is defined and
+        php_version | version_compare('7.0', 'ge')

 - hosts: all
  vars: