From 6b520c1d9b331abc36a4030fa5021949a7ae23b4 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Dec 15 2020 18:10:10 +0000
Subject: simple-rpm-build: minimize the use of ansible_user_dir


---

diff --git a/roles/simple-srpm-build/tasks/main.yaml b/roles/simple-srpm-build/tasks/main.yaml
index 3cae054..ade3f64 100644
--- a/roles/simple-srpm-build/tasks/main.yaml
+++ b/roles/simple-srpm-build/tasks/main.yaml
@@ -29,18 +29,20 @@
     - SRPMS
 
 - name: Copy local HEAD source to rpmbuild SOURCES directory
-  shell: >
-    cp {{ ansible_user_dir}}/{{ zuul.project.src_dir }}/*HEAD.tgz
-    {{ ansible_user_dir }}/rpmbuild/SOURCES
+  shell: cp *HEAD.tgz {{ ansible_user_dir }}/rpmbuild/SOURCES
   when: "{{ build_from_source | default(false) }}"
+  args:
+    chdir: "{{ zuul.project.src_dir }}"
 
 - name: Retrieve sources
-  shell: >
-    spectool -g -C {{ ansible_user_dir }}/rpmbuild/SOURCES
-    {{ ansible_user_dir}}/{{ zuul.project.src_dir }}/*.spec
+  shell: spectool -g -C {{ ansible_user_dir }}/rpmbuild/SOURCES *.spec
+  args:
+    chdir: "{{ zuul.project.src_dir }}"
 
 - name: Build the SRPM
-  shell: rpmbuild {{ rpmbuild_extra_args }} -bs {{ ansible_user_dir }}/{{ zuul.project.src_dir }}/*.spec
+  shell: rpmbuild {{ rpmbuild_extra_args }} -bs *.spec
+  args:
+    chdir: "{{ zuul.project.src_dir }}"
 
 - name: Get SRPM path
   command: ls {{ ansible_user_dir }}/rpmbuild/SRPMS/