Merge pull request #6909 from AlanCoding/git_success

Allow performing git project updates when Ansible 2.10 (ansible-base) is installed

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

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
 

awx/playbooks/project_update_hg_tasks.yml

@@ -0,0 +1,17 @@
+---
+- 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')}}"