From e07c9a198c1144fe1390c87d00e082fee5ddcacb Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Mar 06 2020 13:45:08 +0000
Subject: [PATCH 1/3] repo-setup: identify the current change artifact


---

diff --git a/roles/repo-setup/tasks/main.yaml b/roles/repo-setup/tasks/main.yaml
index 4b08a72..b2f5e73 100644
--- a/roles/repo-setup/tasks/main.yaml
+++ b/roles/repo-setup/tasks/main.yaml
@@ -5,8 +5,13 @@
     dest: "/etc/yum.repos.d/zuul-build.repo"
     content: |
       {% for artifact in zuul.artifacts|default([]) %}{% if artifact.name == 'repo' %}
+      {% if artifact.change == zuul.change and artifact.patchset == zuul.patchset %}
+      [zuul-built]
+      name=zuul-built
+      {% else %}
       [{{ artifact.project | regex_replace('/', '_') }}-{{ artifact.change }}-{{ artifact.patchset }}]
       name={{ artifact.project }}-{{ artifact.change }}-{{ artifact.patchset }}
+      {% endif %}
       enabled=1
       baseurl={{ artifact.url }}
       gpgcheck=0

From d11dc581aaa8c4f4cfdbad2cb7fba938b4449480 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Mar 06 2020 13:45:08 +0000
Subject: [PATCH 2/3] repo-setup: make sure other roles are using zuul-built repo as name


---

diff --git a/roles/dlrn-build/tasks/main.yaml b/roles/dlrn-build/tasks/main.yaml
index 6960d7c..92baa4c 100644
--- a/roles/dlrn-build/tasks/main.yaml
+++ b/roles/dlrn-build/tasks/main.yaml
@@ -36,6 +36,10 @@
     insertafter: '# SPECULATIVE REPO HERE'
     content: |
       {% for artifact in zuul.artifacts|default([]) %}{% if artifact.name == 'dlrn-repo' %}
+      {% if artifact.change == zuul.change and artifact.patchset == zuul.patchset %}
+      [zuul-built]
+      name=zuul-built
+      {% else %}
       [{{ artifact.project | regex_replace('/', '_') }}-{{ artifact.change }}-{{ artifact.patchset }}]
       name={{ artifact.project }}-{{ artifact.change }}-{{ artifact.patchset }}
       enabled=1
diff --git a/roles/dlrn-setup/tasks/main.yaml b/roles/dlrn-setup/tasks/main.yaml
index 9bd9027..cdccafd 100644
--- a/roles/dlrn-setup/tasks/main.yaml
+++ b/roles/dlrn-setup/tasks/main.yaml
@@ -5,6 +5,10 @@
     dest: "/etc/yum.repos.d/zuul-build.repo"
     content: |
       {% for artifact in zuul.artifacts|default([]) %}{% if artifact.name == 'dlrn-repo' %}
+      {% if artifact.change == zuul.change and artifact.patchset == zuul.patchset %}
+      [zuul-built]
+      name=zuul-built
+      {% else %}
       [{{ artifact.project | regex_replace('/', '_') }}-{{ artifact.change }}-{{ artifact.patchset }}]
       name={{ artifact.project }}-{{ artifact.change }}-{{ artifact.patchset }}
       enabled=1
diff --git a/roles/rpm-artifact-url/tasks/main.yaml b/roles/rpm-artifact-url/tasks/main.yaml
index b3b67cc..205dd45 100644
--- a/roles/rpm-artifact-url/tasks/main.yaml
+++ b/roles/rpm-artifact-url/tasks/main.yaml
@@ -12,7 +12,7 @@
   when: repoquery_exists.rc != 0
 
 - name: Get repository packages
-  command: repoquery -q --nvr --repo {{ zuul.project.name | regex_replace('/', '_') }}-{{ zuul.change }}-{{ zuul.patchset }}
+  command: repoquery -q --nvr --repo zuul_built
   register: packages
 
 - name: Get packages download urls

From 5d7fd987820f8ecd285fb7aab9b0d26747511d70 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Mar 06 2020 13:45:08 +0000
Subject: [PATCH 3/3] rpm-artifatct-url: typo fix


---

diff --git a/roles/rpm-artifact-url/tasks/main.yaml b/roles/rpm-artifact-url/tasks/main.yaml
index 205dd45..d9642b2 100644
--- a/roles/rpm-artifact-url/tasks/main.yaml
+++ b/roles/rpm-artifact-url/tasks/main.yaml
@@ -12,7 +12,7 @@
   when: repoquery_exists.rc != 0
 
 - name: Get repository packages
-  command: repoquery -q --nvr --repo zuul_built
+  command: repoquery -q --nvr --repo zuul-built
   register: packages
 
 - name: Get packages download urls