From 441374548d4d1135e06a540dae81d79b68c62a45 Mon Sep 17 00:00:00 2001
From: Chandan Kumar (raukadah) <raukadah@gmail.com>
Date: Oct 31 2019 11:54:17 +0000
Subject: Added ensure-mock role


Currently mock installation is tied up with mock-build role.
In order to just consume the mock installation part in other jobs
like ceph-ansible or podman gating, moving it to a seperate role
makes it easier.

Signed-off-by: Chandan Kumar (raukadah) <raukadah@gmail.com>

---

diff --git a/playbooks/rpm/mock-build.yaml b/playbooks/rpm/mock-build.yaml
index a3849c7..5a77b5a 100644
--- a/playbooks/rpm/mock-build.yaml
+++ b/playbooks/rpm/mock-build.yaml
@@ -1,4 +1,5 @@
 - hosts: all
   roles:
+    - ensure-mock
     - mock-srpm-build
     - mock-build
diff --git a/roles/ensure-mock/tasks/main.yaml b/roles/ensure-mock/tasks/main.yaml
new file mode 100644
index 0000000..988e147
--- /dev/null
+++ b/roles/ensure-mock/tasks/main.yaml
@@ -0,0 +1,18 @@
+---
+- name: Install pre-requisites for mock
+  package:
+    name:
+      - createrepo
+      - mock
+      - redhat-rpm-config
+      - rpmdevtools
+      - spectool
+    state: present
+  become: true
+
+- name: Ensure user in mock group
+  user:
+    name: "{{ ansible_user }}"
+    groups: mock
+    append: yes
+  become: true
diff --git a/roles/mock-build/tasks/main.yaml b/roles/mock-build/tasks/main.yaml
index 6170d22..90bded5 100644
--- a/roles/mock-build/tasks/main.yaml
+++ b/roles/mock-build/tasks/main.yaml
@@ -1,14 +1,4 @@
 ---
-- name: Install system dependencies
-  yum:
-    name: "mock,createrepo"
-    state: latest
-  become: true
-
-- name: Ensure user in mock group
-  command: usermod -a -G mock {{ ansible_user_id }}
-  become: true
-
 - name: Set mock options fact
   set_fact:
     mock_opts: "-v -r {{ mock_config }} --resultdir {{ ansible_user_dir }}/repo"
diff --git a/roles/mock-srpm-build/tasks/main.yaml b/roles/mock-srpm-build/tasks/main.yaml
index 162d80d..49688f3 100644
--- a/roles/mock-srpm-build/tasks/main.yaml
+++ b/roles/mock-srpm-build/tasks/main.yaml
@@ -1,14 +1,4 @@
 ---
-- name: Install system dependencies
-  yum:
-    name: "spectool,mock"
-    state: latest
-  become: true
-
-- name: Ensure user in mock group
-  command: usermod -a -G mock {{ ansible_user_id }}
-  become: true
-
 - name: Set mock options fact
   set_fact:
     mock_opts: "-v -r {{ mock_config }} --resultdir {{ ansible_user_dir }}/repo"