diff --git a/tasks/main.yml b/tasks/main.yml index 14dc7da13f1babf115853e550af943f5eab624f1..5f0cf4a65a9b4d1aab507a0f12f22873603d7bc4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,17 @@ --- # tasks file for nodejs +- name: Load meta vars + include_vars: + file: meta/main.yml + name: meta + - name: Assertions assert: that: - - ansible_os_family == 'Debian' - - ansible_lsb is mapping - - ansible_lsb.codename in ['buster', 'jessie', 'sid', 'stretch', 'trusty', 'xenial', 'yakkety', 'zesty'] + - ansible_distribution in meta.galaxy_info.platforms|map(attribute='name') + - | + (meta.galaxy_info.platforms|selectattr('name', 'equalto', ansible_distribution)|first).versions|intersect([ansible_distribution_release, ansible_distribution_version])|length > 0 - nodejs_version in [6, 8] - name: APT install prerequisites diff --git a/tests/playbook.yml b/tests/playbook.yml index dcc12fb3158195d903e7455dd88e6ab16383a092..dc97062c454db3fa976a0f2ca485e653f8bc65ef 100644 --- a/tests/playbook.yml +++ b/tests/playbook.yml @@ -19,4 +19,5 @@ - hosts: all roles: + - role: python27 - role: nodejs diff --git a/tests/requirements.txt b/tests/requirements.txt index 1361b26d44a90352ec0160b571983c12ea0de190..18a69349e41024d4f6956147a2b4a09910bb1809 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,4 +1,4 @@ -ansible==2.3.2.0 +ansible==2.4.0.0 testinfra==1.7.0 molecule<2 ansible-lint==3.4.15 diff --git a/tests/requirements.yml b/tests/requirements.yml index fccce7574df98d466c55a309273c4060174e8cb0..7e87c80fa4734d9384fe9e11aba2411a05cde486 100644 --- a/tests/requirements.yml +++ b/tests/requirements.yml @@ -5,3 +5,5 @@ name: debian-bootstrap - src: adarnimrod.users name: users +- src: adarnimrod.python27 + name: python27