From e5847d1676ea75ffd5af64dfddd2633007af5973 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 28 Apr 2018 22:56:13 +1000 Subject: [PATCH 1/5] Updates to remove deprecation notices. Signed-off-by: Karl Hepworth --- .travis.yml | 8 ++++---- meta/main.yml | 2 +- tasks/main.yml | 4 ++-- tasks/yarn.yml | 3 +-- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9280008..2827b61 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 diff --git a/meta/main.yml b/meta/main.yml index b137516..6a95f76 100755 --- a/meta/main.yml +++ b/meta/main.yml @@ -34,7 +34,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..ce34faf 100644 --- a/tasks/yarn.yml +++ b/tasks/yarn.yml @@ -22,7 +22,6 @@ shell: which yarn register: yarn_result changed_when: '"yarn" not in yarn_result.stdout' - changed_when: false failed_when: false - name: "Yarn | Register existing installation status" @@ -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" From 16df3c84a1c71f1697bb57978c6201d12a6c555f Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 28 Apr 2018 23:00:31 +1000 Subject: [PATCH 2/5] Prevent a changed state on the installation check. --- tasks/yarn.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/yarn.yml b/tasks/yarn.yml index ce34faf..bbe437b 100644 --- a/tasks/yarn.yml +++ b/tasks/yarn.yml @@ -21,7 +21,7 @@ - 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 - name: "Yarn | Register existing installation status" From 0648c57469580809652ddb620e1226ad683c8c5e Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 28 Apr 2018 23:11:56 +1000 Subject: [PATCH 3/5] Removes verbose from tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2827b61..62f6ef1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -122,7 +122,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} From 179d802a8da93f4bc5b9502b6edfebc42689cf7b Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 28 Apr 2018 23:12:18 +1000 Subject: [PATCH 4/5] Update minimum ansible version --- meta/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 6a95f76..10af3c7 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: From ee6dc39837919bbf0915b1b26ec9e20c9fbea963 Mon Sep 17 00:00:00 2001 From: Karl Hepworth Date: Sat, 28 Apr 2018 23:30:55 +1000 Subject: [PATCH 5/5] Add support for Fedora 28 Signed-off-by: Karl Hepworth --- .travis.yml | 4 ++++ meta/main.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 62f6ef1..4908508 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/meta/main.yml b/meta/main.yml index 10af3c7..e2577fe 100755 --- a/meta/main.yml +++ b/meta/main.yml @@ -23,6 +23,7 @@ galaxy_info: - 25 - 26 - 27 + - 28 - name: Ubuntu versions: - precise