From e77c12e3e6abaa21977dc723fc5ea662ef6b65ec Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Nov 19 2020 16:22:25 +0000
Subject: rpminspect: workaround non working -w arg


---

diff --git a/roles/rpminspect/defaults/main.yaml b/roles/rpminspect/defaults/main.yaml
index 393a0a6..b41f9a3 100644
--- a/roles/rpminspect/defaults/main.yaml
+++ b/roles/rpminspect/defaults/main.yaml
@@ -6,3 +6,4 @@ zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
 check_previous_build_enabled: false
 validate_cert: true
 arches: x86_64,noarch,src
+workdir: /var/tmp/rpminspect
diff --git a/roles/rpminspect/tasks/main.yaml b/roles/rpminspect/tasks/main.yaml
index bf999c1..22ea4ca 100644
--- a/roles/rpminspect/tasks/main.yaml
+++ b/roles/rpminspect/tasks/main.yaml
@@ -1,4 +1,9 @@
 ---
+- name: Create working directory for rpminspect
+  file:
+    path: "{{ workdir }}"
+    state: directory
+
 - name: Install rpminspect COPR repo
   command: dnf -y copr enable dcantrell/rpminspect
   become: true
@@ -28,11 +33,13 @@
     when: check_previous_build.stdout
 
   - name: Download latest build from Koji with rpminspect
-    command: "{{ rpminspect_cmd }} -v -w /var/tmp/rpminspect -f {{ previous_build }}"
+    command: "{{ rpminspect_cmd }} -v -w . -f {{ previous_build }}"
+    args:
+      chdir: "{{ workdir }}"
     when: check_previous_build.stdout
 
   - set_fact:
-      previous_build_path: /var/tmp/rpminspect/{{ previous_build }}
+      previous_build_path: "{{ workdir }}/{{ previous_build }}"
     when: check_previous_build.stdout
   when: check_previous_build_enabled
 
@@ -43,18 +50,18 @@
 - set_fact:
     previous_build_path: "{{ previous_build_path | default('') }}"
 
-- command: mkdir -p /var/tmp/rpminspect/{{ baserpmname }}/src
+- command: mkdir -p {{ workdir }}/{{ baserpmname }}/src
 
 - name: Fetch srpm
   get_url:
     url: "{{ srpm }}"
-    dest: "/var/tmp/rpminspect/{{ baserpmname }}/src/"
+    dest: "{{ workdir }}/{{ baserpmname }}/src/"
     validate_certs: "{{ validate_cert }}"
 
 - name: Show rpminspect cache tree
-  command: find {{ previous_build_path }} /var/tmp/rpminspect/{{ baserpmname }}
+  command: find {{ previous_build_path }} {{ workdir }}/{{ baserpmname }}
 
 - name: Run rpminspect
   command: |
     {{ rpminspect_cmd }} -k -t BAD -a {{ arches }} -o {{ zuul_output_dir }}/logs/result.json -F json
-    {{ previous_build_path }} /var/tmp/rpminspect/{{ baserpmname }}
+    {{ previous_build_path }} {{ workdir }}/{{ baserpmname }}
diff --git a/roles/rpminspect/tasks/setcache.yaml b/roles/rpminspect/tasks/setcache.yaml
index 1a75377..480a7b3 100644
--- a/roles/rpminspect/tasks/setcache.yaml
+++ b/roles/rpminspect/tasks/setcache.yaml
@@ -17,10 +17,10 @@
     baserpmname: "{{ get_basename.stdout }}"
     arch: "{{ get_arch.stdout }}"
 
-- command: mkdir -p /var/tmp/rpminspect/{{ baserpmname }}/{{ arch }}
+- command: mkdir -p {{ workdir }}/{{ baserpmname }}/{{ arch }}
 
 - name: Copy rpm in rpminspect cache
   copy:
     src: "/tmp/{{ item | basename }}"
-    dest: /var/tmp/rpminspect/{{ baserpmname }}/{{ arch }}/{{ item | basename }}
+    dest: "{{ workdir }}/{{ baserpmname }}/{{ arch }}/{{ item | basename }}"
     remote_src: true