From 663ff03ce890242e774b6e41c3b053bdb5806f55 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Mon, 17 Feb 2020 13:18:40 +0100
Subject: [PATCH] repo_build: take distro version into account

When introducing a new repo_container with a different distro, using
the same directory for symlinks can result in weird builds. We should
prevent the links directory to be copied all willy-nilly, as suggested
here;

https://review.opendev.org/#/c/712784/
https://review.opendev.org/#/c/712787/

But we can further prevent bad builds by separating under distro-arch
under links with this patch.

Depends-On: Ieca6ec9bf898432c76c019a1d2d97c280cd85dce
Change-Id: I4ae6737f1ded4cbb680a380c8c309a0f5bf64723
(cherry picked from commit d5e33c8afa6401392f9286f9cf3ffe7bc1a5bc8e)
---
 defaults/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ff2796b..11232da 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -41,7 +41,7 @@ repo_build_base_path: "/var/www/repo"
 repo_build_os_distro_version: "{{ (ansible_distribution | lower) | replace(' ', '_') }}-{{ ansible_distribution_version.split('.')[:2] | join('.') }}-{{ ansible_architecture | lower }}"
 
 repo_build_release_tag: "untagged"
-repo_build_global_links_path: "{{ repo_build_base_path }}/links"
+repo_build_global_links_path: "{{ repo_build_base_path }}/links/{{ repo_build_os_distro_version }}"
 repo_build_release_version_path: "os-releases/{{ repo_build_release_tag }}"
 repo_build_release_path: "{{ repo_build_base_path }}/{{ repo_build_release_version_path }}/{{ repo_build_os_distro_version }}"
 repo_build_dir: "/tmp/openstack-builder"