Merge "Build branchless projects with build-tests role"

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

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:

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