Use git_repository role for handling git checkouts

Author: adamruzicka

development/roles/foreman_development/defaults/main.yaml

@@ -19,10 +19,8 @@ foreman_development_git_revision: "develop"
 foreman_development_github_username: ""
 
 foreman_development_hammer_git_repo: "https://github.com/theforeman/hammer-cli.git"
-foreman_development_hammer_git_revision: "master"
 
 foreman_development_smart_proxy_git_repo: "https://github.com/theforeman/smart-proxy.git"
-foreman_development_smart_proxy_git_revision: "develop"
 
 foreman_development_rails_port: 3000
 foreman_development_rails_command: "puma -w 2 -p {{ foreman_development_rails_port }} --preload -b tcp://0.0.0.0"

development/roles/foreman_development/tasks/hammer/main.yml

@@ -1,22 +1,13 @@
-- name: Clone Hammer repository
-  ansible.builtin.git:
-    repo: "{{ foreman_development_hammer_git_repo }}"
-    dest: "{{ foreman_development_hammer_dir }}"
-    version: "{{ foreman_development_hammer_git_revision }}"
-    force: true
-  become: true
-  become_user: "{{ foreman_development_user }}"
-
-- name: Add GitHub username as additional remote for Foreman
-  community.general.git_config:
-    name: "remote.{{ foreman_development_github_username }}.url"
-    scope: local
-    repo: "{{ foreman_development_hammer_dir }}"
-    value: "[email protected]:{{ foreman_development_github_username }}/hammer-cli.git"
-    state: present
-  become: true
-  become_user: "{{ foreman_development_user }}"
-  when: foreman_development_github_username != ""
+- name: Deploy Hammer git repository
+  ansible.builtin.include_role:
+    name: git_repository
+  vars:
+    git_repository_destination_dir: "{{ foreman_development_hammer_dir }}"
+    git_repository_user: "{{ foreman_development_user }}"
+    git_repository_repository_owner: "theforeman"
+    git_repository_repository_name: "hammer-cli"
+    git_repository_revision: "{{ foreman_development_hammer_git_revision }}"
+    git_repository_secondary_remote_owner: "{{ foreman_development_github_username }}"
 
 - name: Setup hammer-cli-foreman
   ansible.builtin.include_tasks: hammer/plugin.yml

development/roles/foreman_development/tasks/hammer/plugin.yml

@@ -1,26 +1,15 @@
 ---
-- name: "Clone plugin repository for {{ foreman_development_plugin_name }}"  # noqa latest[git]
-  ansible.builtin.git:
-    repo: "{{ foreman_development_plugin_repo_url }}"
-    dest: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
-    force: true
-  become: true
-  become_user: "{{ foreman_development_user }}"
+- name: "Deploy plugin git repository for {{ foreman_development_plugin_name }}"
+  ansible.builtin.include_role:
+    name: git_repository
+  vars:
+    git_repository_destination_dir: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
+    git_repository_user: "{{ foreman_development_user }}"
+    git_repository_repository_owner: "{{ foreman_development_plugin_org }}"
+    git_repository_repository_name: "{{ foreman_development_plugin_name }}"
+    git_repository_secondary_remote_owner: "{{ foreman_development_github_username }}"
   when: foreman_development_plugin_manage_repo
 
-- name: "Add GitHub username as additional remote for {{ foreman_development_plugin_name }}"
-  community.general.git_config:
-    name: "remote.{{ foreman_development_github_username }}.url"
-    scope: local
-    repo: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
-    value: "[email protected]:{{ foreman_development_github_username }}/{{ foreman_development_plugin_name }}.git"
-    state: present
-  become: true
-  become_user: "{{ foreman_development_user }}"
-  when:
-    - foreman_development_plugin_manage_repo
-    - foreman_development_github_username != ""
-
 - name: "Create settings file for {{ foreman_development_plugin_name }}"
   ansible.builtin.template:
     src: "{{ foreman_development_plugin_settings_template }}"

development/roles/foreman_development/tasks/smart-proxy/main.yml

@@ -1,23 +1,13 @@
 ---
-- name: Clone smart-proxy repository
-  ansible.builtin.git:
-    repo: "{{ foreman_development_smart_proxy_git_repo }}"
-    dest: "{{ foreman_development_smart_proxy_dir }}"
-    version: "{{ foreman_development_smart_proxy_git_revision }}"
-    force: true
-  become: true
-  become_user: "{{ foreman_development_user }}"
-
-- name: Add GitHub username as additional remote for smart-proxy
-  community.general.git_config:
-    name: "remote.{{ foreman_development_github_username }}.url"
-    scope: local
-    repo: "{{ foreman_development_smart_proxy_dir }}"
-    value: "[email protected]:{{ foreman_development_github_username }}/smart-proxy.git"
-    state: present
-  become: true
-  become_user: "{{ foreman_development_user }}"
-  when: foreman_development_github_username != ""
+- name: Deploy smart-proxy git repository
+  ansible.builtin.include_role:
+    name: git_repository
+  vars:
+    git_repository_destination_dir: "{{ foreman_development_smart_proxy_dir }}"
+    git_repository_user: "{{ foreman_development_user }}"
+    git_repository_repository_owner: "theforeman"
+    git_repository_repository_name: "smart-proxy"
+    git_repository_secondary_remote_owner: "{{ foreman_development_github_username }}"
 
 - name: Create cert directories
   ansible.builtin.file:

development/roles/foreman_development/tasks/smart-proxy/plugin.yml

@@ -1,26 +1,15 @@
 ---
-- name: "Clone smart-proxy plugin repository for {{ foreman_development_plugin_name }}"  # noqa latest[git]
-  ansible.builtin.git:
-    repo: "{{ foreman_development_plugin_repo_url }}"
-    dest: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
-    force: true
-  become: true
-  become_user: "{{ foreman_development_user }}"
+- name: "Deploy smart-proxy plugin git repository for {{ foreman_development_plugin_name }}"
+  ansible.builtin.include_role:
+    name: git_repository
+  vars:
+    git_repository_destination_dir: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
+    git_repository_user: "{{ foreman_development_user }}"
+    git_repository_repository_owner: "{{ foreman_development_plugin_org }}"
+    git_repository_repository_name: "{{ foreman_development_plugin_name }}"
+    git_repository_secondary_remote_owner: "{{ foreman_development_github_username }}"
   when: foreman_development_plugin_manage_repo
 
-- name: "Add GitHub username as additional remote for {{ foreman_development_plugin_name }}"
-  community.general.git_config:
-    name: "remote.{{ foreman_development_github_username }}.url"
-    scope: local
-    repo: "{{ foreman_development_deployment_dir }}/{{ foreman_development_plugin_name }}"
-    value: "[email protected]:{{ foreman_development_github_username }}/{{ foreman_development_plugin_name }}.git"
-    state: present
-  become: true
-  become_user: "{{ foreman_development_user }}"
-  when:
-    - foreman_development_plugin_manage_repo
-    - foreman_development_github_username != ""
-
 - name: "Create settings file for {{ foreman_development_plugin_name }}"
   ansible.builtin.template:
     src: "{{ foreman_development_plugin_settings_template }}"