From 81f60f27c7410a84aa8209d0158c6ce29bf53f52 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: May 17 2021 08:13:14 +0000
Subject: [PATCH 1/3] mock-build roles: Update to be compatible with simple-repo-fetch


simple-repo-fetch role relies on the base job (post-run task) to
fetch {{ zuul_output_dir }}/logs. It only set the zuul_return artifact.
Then we no longer need repo-fetch role and the additional rsync to the
zuul executor.

---

diff --git a/playbooks/rpm/repo-fetch.yaml b/playbooks/rpm/repo-fetch.yaml
index d57ee47..c3e2e62 100644
--- a/playbooks/rpm/repo-fetch.yaml
+++ b/playbooks/rpm/repo-fetch.yaml
@@ -1,3 +1,3 @@
 - hosts: all
   roles:
-    - repo-fetch
+    - simple-repo-fetch
diff --git a/roles/mock-build/tasks/main.yaml b/roles/mock-build/tasks/main.yaml
index d24f4fe..6579477 100644
--- a/roles/mock-build/tasks/main.yaml
+++ b/roles/mock-build/tasks/main.yaml
@@ -1,4 +1,8 @@
 ---
+- name: Set output_repo_dir to be compatible with simple-repo-fetch role
+  set_fact:
+    output_repo_dir: "{{ zuul_output_dir }}/logs/repo"
+
 - name: Set mock options fact
   set_fact:
     mock_opts: "-v -r {{ mock_config }}"
@@ -27,4 +31,4 @@
 - name: Sync chained repo in {{ ansible_user_dir }}/repo
   command: >
     rsync -av {{ ansible_user_dir }}/chainrepo/results/{{ mock_config }}/
-    {{ ansible_user_dir }}/repo/
+    {{ output_repo_dir }}/
diff --git a/roles/mock-srpm-build/tasks/main.yaml b/roles/mock-srpm-build/tasks/main.yaml
index fb435c7..cba3f3b 100644
--- a/roles/mock-srpm-build/tasks/main.yaml
+++ b/roles/mock-srpm-build/tasks/main.yaml
@@ -1,4 +1,8 @@
 ---
+- name: Set output_repo_dir to be compatible with simple-repo-fetch role
+  set_fact:
+    output_repo_dir: "{{ zuul_output_dir }}/logs/repo"
+
 - name: Discover package name from specfile name
   shell: ls *.spec | sed 's/\.spec$//'
   args:
@@ -11,7 +15,7 @@
 
 - name: Set mock options fact
   set_fact:
-    mock_opts: "-v -r {{ mock_config }} --resultdir {{ ansible_user_dir }}/repo"
+    mock_opts: "-v -r {{ mock_config }} --resultdir {{ output_repo_dir }}"
 
 - name: Retrieve URL sources
   shell: >
@@ -30,7 +34,7 @@
 - name: Rename log file with srpm prefix
   command: |
     mv {{ ansible_user_dir }}/repo/{{ item }}
-    {{ ansible_user_dir }}/repo/srpm_{{ package_name }}_{{ item }}
+    {{ output_repo_dir }}/srpm_{{ package_name }}_{{ item }}
   loop:
     - build.log
     - hw_info.log
@@ -38,7 +42,7 @@
     - state.log
 
 - name: Get SRPM path
-  shell: ls {{ ansible_user_dir }}/repo/{{ package_name }}-*.src.rpm
+  shell: ls {{ output_repo_dir }}/{{ package_name }}-*.src.rpm
   register: result
 
 - name: Set SRPM path fact

From b4bd321ad3950beb0704a9773da1e1314f2c37ff Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: May 17 2021 08:32:30 +0000
Subject: [PATCH 2/3] ensure zuul_output_dir is set


---

diff --git a/roles/mock-build/defaults/main.yaml b/roles/mock-build/defaults/main.yaml
index bcfaf37..47a877b 100644
--- a/roles/mock-build/defaults/main.yaml
+++ b/roles/mock-build/defaults/main.yaml
@@ -1,2 +1,3 @@
+zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
 mock_config: fedora-rawhide-x86_64
 repos: []
diff --git a/roles/mock-srpm-build/defaults/main.yaml b/roles/mock-srpm-build/defaults/main.yaml
index fb82235..f4ce64a 100644
--- a/roles/mock-srpm-build/defaults/main.yaml
+++ b/roles/mock-srpm-build/defaults/main.yaml
@@ -1 +1,2 @@
+zuul_output_dir: "{{ ansible_user_dir }}/zuul-output"
 mock_config: fedora-rawhide-x86_64

From 165c6b972a89dac1d18d145288fd9b3c9445ac15 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: May 17 2021 08:43:01 +0000
Subject: [PATCH 3/3] mock-srpm-build: fix missing use of output_repo_dir


---

diff --git a/roles/mock-srpm-build/tasks/main.yaml b/roles/mock-srpm-build/tasks/main.yaml
index cba3f3b..1063ef3 100644
--- a/roles/mock-srpm-build/tasks/main.yaml
+++ b/roles/mock-srpm-build/tasks/main.yaml
@@ -33,7 +33,7 @@
 
 - name: Rename log file with srpm prefix
   command: |
-    mv {{ ansible_user_dir }}/repo/{{ item }}
+    mv {{ output_repo_dir }}/{{ item }}
     {{ output_repo_dir }}/srpm_{{ package_name }}_{{ item }}
   loop:
     - build.log