From 3877173e15c1cbee285e66c13580b62026e8439a Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Tue, 26 Oct 2021 12:07:32 +0300
Subject: [PATCH] Build branchless projects with build-tests role

Some repositories don't have branches, using only master.
We need still build them in stable branches.

Added following branchless projects for now, more can
be added later:
 - openstack/octavia-tempest-plugin
 - openstack/tempest
 - openstack/validations-common
 - opnestack/validations-libs
 - x/tripleo-ipa

Change-Id: I8e708e88f16f29238c080a6209928d4d8e955e98
---
 roles/build-test-packages/defaults/main.yml    |  7 +++++++
 roles/build-test-packages/tasks/dlrn-build.yml | 16 ++++++++++++----
 roles/build-test-packages/tasks/main.yml       | 11 +++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/roles/build-test-packages/defaults/main.yml b/roles/build-test-packages/defaults/main.yml
index a5db9ff08..4b9dc9317 100644
--- a/roles/build-test-packages/defaults/main.yml
+++ b/roles/build-test-packages/defaults/main.yml
@@ -89,3 +89,10 @@ artg_github_projects:
   - ansible-collections/community.general
   - ansible-collections/ansible.posix
   - ansible-collections/ansible.netcommon
+
+artg_branchless_projects:
+  - openstack/octavia-tempest-plugin
+  - openstack/tempest
+  - openstack/validations-common
+  - openstack/validations-libs
+  - x/tripleo-ipa
diff --git a/roles/build-test-packages/tasks/dlrn-build.yml b/roles/build-test-packages/tasks/dlrn-build.yml
index 762dec07d..539810d2c 100644
--- a/roles/build-test-packages/tasks/dlrn-build.yml
+++ b/roles/build-test-packages/tasks/dlrn-build.yml
@@ -7,10 +7,18 @@
   debug:
     var: artg_release
 
-- name: Set DLRN distro (legacy distgit branch naming)
-  set_fact:
-    artg_distro: "rpm-{{ artg_release }}"
-  when: artg_release in ['master', 'mitaka']
+- when: artg_release in ['master', 'mitaka']
+  block:
+    - name: Set DLRN distro (legacy distgit branch naming)
+      set_fact:
+        artg_distro: "rpm-{{ artg_release }}"
+
+    - name: Set DLRN distro for branchless projects
+      set_fact:
+        artg_distro: "{{ release }}-rdo"
+      when:
+        - release is defined and release not in ['master', 'mitaka']
+        - artg_change.project in artg_branchless_projects
 
 - name: Set DLRN distro (new stable branch naming scheme)
   set_fact:
diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml
index 3708789cd..e208d57b4 100644
--- a/roles/build-test-packages/tasks/main.yml
+++ b/roles/build-test-packages/tasks/main.yml
@@ -197,7 +197,10 @@
     - zuul is defined
     - "'change_url' in item"
     - item.project.name not in artg_change_list|default([]) | map(attribute='project') |list
-    - (item.branch == zuul.override_checkout | default(zuul.branch)) or (osp_release is defined and osp_release in item.branch)
+    - >-
+        (item.branch == zuul.override_checkout | default(zuul.branch)) or
+        (osp_release is defined and osp_release in item.branch) or
+        item.project.name in artg_branchless_projects
 
 - name: Detect github PRs from commit message
   include: detect_github_pr.yml
@@ -222,7 +225,11 @@
   when:
     - '"-distgit" not in item.project'
     - item.project not in artg_skipped_projects
-    - release in item.branch or (zuul.project.name | default("") == rdoinfo_repo_name) or (osp_release is defined and osp_release in item.branch)
+    - >-
+        release in item.branch or
+        (zuul.project.name | default("") == rdoinfo_repo_name) or
+        (osp_release is defined and osp_release in item.branch) or
+        item.project in artg_branchless_projects
     - '"github.com" not in item.host'
 
 - name: Build package using DLRN