From 6053122a25394cd435c26ed355eaccd852db8309 Mon Sep 17 00:00:00 2001
From: fpantano <fpantano@redhat.com>
Date: Thu, 4 Apr 2019 10:16:33 +0200
Subject: [PATCH] Handle package builds when testing in rdoinfo

rdoinfo is branchless and to test reviews under
non-master branches, we need to treat rdoinfo
specially.

Also use zuul.override_checkout if defined to build
zuul_deps.

Change-Id: I44353e7308d2eab56e986d0f2f6fb3a80a25b227
---
 roles/build-test-packages/tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml
index 6dd073990..7a881651c 100644
--- a/roles/build-test-packages/tasks/main.yml
+++ b/roles/build-test-packages/tasks/main.yml
@@ -203,7 +203,7 @@
   zuul_deps:
     host: "{{ lookup('env', 'ZUUL_URL')|default('https://review.opendev.org', true) }}"
     changes: "{{ lookup('env', 'ZUUL_CHANGES') }}"
-    branch: "{{ lookup('env', 'ZUUL_BRANCH') }}"
+    branch: "{{ zuul.override_checkout | default(lookup('env', 'ZUUL_BRANCH')) }}"
   when: zuul_changes != ""  # noqa 602
 
 - name: Add Zuul changes to the change list
@@ -221,7 +221,7 @@
   when:
     - '"-distgit" not in item.project'
     - item.project not in artg_skipped_projects
-    - release in item.branch
+    - release in item.branch or (zuul.project.name | default("") == "rdoinfo")
 
 - name: Run DLRN
   shell: >