From f2976b1274bab222c73306c193dcc8432a9a651e Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Sat, 4 Apr 2020 15:58:19 -0400
Subject: [PATCH] install-yarn: always install

The role previously conditionally installed YARN only if there was
a yarn.lock.  The role shouldn't conditionally decide to install
if there is a yarn.lock file as that's not expected behaviour.

Change-Id: Ia6940df036fd27d55d60fa959b794de952040745
---
 roles/ensure-yarn/README.rst         | 12 ------------
 roles/ensure-yarn/defaults/main.yaml |  2 --
 roles/ensure-yarn/tasks/main.yaml    | 21 ++++++++++-----------
 roles/ensure-yarn/tasks/yarn.yaml    | 11 -----------
 4 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 roles/ensure-yarn/defaults/main.yaml
 delete mode 100644 roles/ensure-yarn/tasks/yarn.yaml

diff --git a/roles/ensure-yarn/README.rst b/roles/ensure-yarn/README.rst
index 18ffe3876..04ecc5acf 100644
--- a/roles/ensure-yarn/README.rst
+++ b/roles/ensure-yarn/README.rst
@@ -1,13 +1 @@
 Install yarn from yarnpkg repos
-
-**Role Variables**
-
-.. zuul:rolevar:: zuul_work_dir
-   :default: {{ zuul.project.src_dir }}
-
-   The directory to work in.
-
-.. zuul:rolevar:: yarn_lock_file_path
-   :default: {{ zuul_work_dir }}/yarn.lock
-
-   Path to yarn.lock file used by a project.
diff --git a/roles/ensure-yarn/defaults/main.yaml b/roles/ensure-yarn/defaults/main.yaml
deleted file mode 100644
index e49463cca..000000000
--- a/roles/ensure-yarn/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-zuul_work_dir: "{{ zuul.project.src_dir }}"
-yarn_lock_file_path: "{{ zuul_work_dir }}/yarn.lock"
diff --git a/roles/ensure-yarn/tasks/main.yaml b/roles/ensure-yarn/tasks/main.yaml
index 70beafd19..8c69e4b91 100644
--- a/roles/ensure-yarn/tasks/main.yaml
+++ b/roles/ensure-yarn/tasks/main.yaml
@@ -21,15 +21,14 @@
     repositories_keys: "{{ _yarn_keys | default([]) }}"
     repositories_list: "{{ _yarn_repos | default([]) }}"
 
-- name: Check for yarn.lock file
-  stat:
-    path: "{{ yarn_lock_file_path }}"
-    get_checksum: false
-    get_mime: false
-    get_md5: false
-  register: yarn_lock
+- name: Install yarn from yarnpkg.com
+  package:
+    name: yarn
+    state: latest
+  become: yes
+  tags:
+    # Ignore ANSIBLE0010: We really want latest version
+    - skip_ansible_lint
 
-- name: Install yarn if needed
-  include: yarn.yaml
-  when:
-    - yarn_lock.stat.exists
+- name: Output yarn version
+  command: yarn --version
diff --git a/roles/ensure-yarn/tasks/yarn.yaml b/roles/ensure-yarn/tasks/yarn.yaml
deleted file mode 100644
index b03565d57..000000000
--- a/roles/ensure-yarn/tasks/yarn.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: Install yarn from yarnpkg.com
-  package:
-    name: yarn
-    state: latest
-  become: yes
-  tags:
-    # Ignore ANSIBLE0010: We really want latest version
-    - skip_ansible_lint
-
-- name: Output yarn version
-  command: yarn --version