From 40fe366727b5bb9e7d4be3f665058e46e72c86f4 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 27 Feb 2020 08:45:18 -0600
Subject: [PATCH] Remove old artifacts when building new ones

For local dev, multiple iterations can wind up with multiple
files in the build_artifact dir. Remove them when building so
that the ls command works.

Change-Id: Id309c34679d2c0b6d9380665a381af4b52495d19
---
 tools/build.py | 10 ++++++++++
 tox.ini        |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/build.py b/tools/build.py
index bfac5126..91382c15 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -22,6 +22,8 @@ import pbr.version
 
 from ruamel.yaml import YAML
 
+import os
+
 
 def generate_version_info():
     version_info = pbr.version.VersionInfo('openstack-cloud')
@@ -39,8 +41,16 @@ def generate_version_info():
         yaml.dump(config, fp)
 
 
+def clean_build():
+    if not os.path.exists('build_artifact'):
+        return
+    for tarball in os.listdir('build_artifact'):
+        os.unlink('build_artifact/{tarball}'.format(tarball=tarball))
+
+
 def main():
     generate_version_info()
+    clean_build()
 
 
 if __name__ == '__main__':
diff --git a/tox.ini b/tox.ini
index 76b79efb..62381680 100644
--- a/tox.ini
+++ b/tox.ini
@@ -34,8 +34,7 @@ commands =
 [testenv:linters]
 passenv = *
 commands =
-    {toxinidir}/tools/build.py
-    ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact
+    {[testenv:build]commands}
     /bin/bash -c "ansible-galaxy collection install $(ls {toxinidir}/build_artifact/openstack-cloud-*) --force -p {toxinidir}"
     /bin/bash -c "cd ansible_collections/openstack/cloud && ansible-test sanity"