diff --git a/.travis.yml b/.travis.yml index 9280008..4908508 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,10 +44,10 @@ env: init: /sbin/init run_opts: --privileged playbook: playbook.yml -# - distro: yakkety -# init: /sbin/init -# run_opts: --privileged -# playbook: playbook.yml + - distro: yakkety + init: /sbin/init + run_opts: --privileged + playbook: playbook.yml - distro: zesty init: /sbin/init run_opts: --privileged @@ -100,6 +100,10 @@ env: init: /usr/lib/systemd/systemd run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro playbook: playbook.yml + - distro: fedora-28 + init: /usr/lib/systemd/systemd + run_opts: --privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro + playbook: playbook.yml before_install: @@ -122,7 +126,7 @@ script: - idempotence=$(mktemp) - > docker exec "$(cat ${container_id})" - ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo -vvvv + ansible-playbook /etc/ansible/roles/role_under_test/tests/${playbook} --sudo | tee -a ${idempotence} - > tail ${idempotence} diff --git a/meta/main.yml b/meta/main.yml index b137516..e2577fe 100755 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,7 +5,7 @@ galaxy_info: author: fubarhouse description: Installs Yarn JS package manager. license: "license (BSD, MIT)" - min_ansible_version: 2.1.0.0 + min_ansible_version: 2.4 platforms: - name: Debian versions: @@ -23,6 +23,7 @@ galaxy_info: - 25 - 26 - 27 + - 28 - name: Ubuntu versions: - precise @@ -34,7 +35,7 @@ galaxy_info: - wily - vivid - xenial -# - yakkety + - yakkety - zesty - artful - bionic diff --git a/tasks/main.yml b/tasks/main.yml index d9fb50e..7a32748 100755 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -23,7 +23,7 @@ when: fubarhouse_user_dir is not defined - name: "Include tasks for Yarn" - include: yarn.yml + include_tasks: yarn.yml - name: "Include tasks for Yarn packages" - include: packages.yml \ No newline at end of file + include_tasks: packages.yml \ No newline at end of file diff --git a/tasks/yarn.yml b/tasks/yarn.yml index a11f833..bbe437b 100644 --- a/tasks/yarn.yml +++ b/tasks/yarn.yml @@ -21,7 +21,6 @@ - name: "Yarn | Check for installation" shell: which yarn register: yarn_result - changed_when: '"yarn" not in yarn_result.stdout' changed_when: false failed_when: false @@ -38,7 +37,7 @@ when: '"Usage" not in yarn_result.stdout and "Yarn requires Node" not in yarn_result.stdout and "is not supported, please use Node.js" not in yarn_result.stdout' - name: "Yarn | Include OS-specific tasks" - include: "yarn-{{ ansible_os_family }}.yml" + include_tasks: "yarn-{{ ansible_os_family }}.yml" when: 'yarn_install_state|bool == true' - name: "Yarn | Install"