From fcca0cee37971153952e5fcf7e06956ec320ac50 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 1 May 2020 10:37:37 -0400
Subject: [PATCH 1/2] use include_tasks to make hg dependency optional

---
 awx/playbooks/project_update.yml          | 18 ++----------------
 awx/playbooks/project_update_hg_tasks.yml | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 awx/playbooks/project_update_hg_tasks.yml

diff --git a/awx/playbooks/project_update.yml b/awx/playbooks/project_update.yml
index fc791069a9..05f58242ea 100644
--- a/awx/playbooks/project_update.yml
+++ b/awx/playbooks/project_update.yml
@@ -48,22 +48,8 @@
         - update_git
 
     - block:
-        - name: update project using hg
-          hg:
-            dest: "{{project_path|quote}}"
-            repo: "{{scm_url|quote}}"
-            revision: "{{scm_branch|quote}}"
-            force: "{{scm_clean}}"
-          register: hg_result
-
-        - name: Set the hg repository version
-          set_fact:
-            scm_version: "{{ hg_result['after'] }}"
-          when: "'after' in hg_result"
-
-        - name: parse hg version string properly
-          set_fact:
-            scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"
+        - name: include hg tasks
+          include_tasks: project_update_hg_tasks.yml
       tags:
         - update_hg
 
diff --git a/awx/playbooks/project_update_hg_tasks.yml b/awx/playbooks/project_update_hg_tasks.yml
new file mode 100644
index 0000000000..e45abc5a5f
--- /dev/null
+++ b/awx/playbooks/project_update_hg_tasks.yml
@@ -0,0 +1,16 @@
+- name: update project using hg
+  hg:
+    dest: "{{project_path|quote}}"
+    repo: "{{scm_url|quote}}"
+    revision: "{{scm_branch|quote}}"
+    force: "{{scm_clean}}"
+  register: hg_result
+
+- name: Set the hg repository version
+  set_fact:
+    scm_version: "{{ hg_result['after'] }}"
+  when: "'after' in hg_result"
+
+- name: parse hg version string properly
+  set_fact:
+    scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"
\ No newline at end of file

From 6d1746f99ce1141ec31064ad51fecdb50e4dcf64 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 1 May 2020 11:50:01 -0400
Subject: [PATCH 2/2] yamllint fixes

---
 awx/playbooks/project_update_hg_tasks.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/awx/playbooks/project_update_hg_tasks.yml b/awx/playbooks/project_update_hg_tasks.yml
index e45abc5a5f..251013698f 100644
--- a/awx/playbooks/project_update_hg_tasks.yml
+++ b/awx/playbooks/project_update_hg_tasks.yml
@@ -1,3 +1,4 @@
+---
 - name: update project using hg
   hg:
     dest: "{{project_path|quote}}"
@@ -13,4 +14,4 @@
 
 - name: parse hg version string properly
   set_fact:
-    scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"
\ No newline at end of file
+    scm_version: "{{scm_version|regex_replace('^([A-Za-z0-9]+).*$', '\\1')}}"