From 97eb24ac4d917a1bfe9bc8959fb9be237670139e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 3 Mar 2020 08:48:50 -0600
Subject: [PATCH] Deal with collection build modifying tree

ansible-galaxy collection build modifies the contents of the tree.
Let's not go in to why this is bad, but instead just deal with it.
The issue in question is that is removes the +x bit from files in
the tree, which means you can't run a build twice in a row locally.
Shrug. Just roll with the -x and update our usage to reflect it.

Change-Id: I0f82531e99a98d656b60079fd3e94d4e3a1dbb6b
---
 ci/run-ansible-tests-collection.sh | 1 -
 tests/sanity/ignore-2.10.txt       | 1 -
 tests/sanity/ignore-2.9.txt        | 1 -
 tools/build.py                     | 0
 tox.ini                            | 4 ++--
 5 files changed, 2 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 ci/run-ansible-tests-collection.sh
 mode change 100755 => 100644 tools/build.py

diff --git a/ci/run-ansible-tests-collection.sh b/ci/run-ansible-tests-collection.sh
old mode 100755
new mode 100644
index 594388c1..8f9c599d
--- a/ci/run-ansible-tests-collection.sh
+++ b/ci/run-ansible-tests-collection.sh
@@ -1,4 +1,3 @@
-#!/bin/bash
 #############################################################################
 # run-ansible-tests.sh
 #
diff --git a/tests/sanity/ignore-2.10.txt b/tests/sanity/ignore-2.10.txt
index d25435d6..184e4fa0 100644
--- a/tests/sanity/ignore-2.10.txt
+++ b/tests/sanity/ignore-2.10.txt
@@ -132,4 +132,3 @@ tests/unit/modules/conftest.py future-import-boilerplate
 tests/unit/modules/conftest.py metaclass-boilerplate
 tests/unit/modules/utils.py future-import-boilerplate
 tests/unit/modules/utils.py metaclass-boilerplate
-ci/run-ansible-tests-collection.sh shebang
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
index 6fbb0409..d53aad35 100644
--- a/tests/sanity/ignore-2.9.txt
+++ b/tests/sanity/ignore-2.9.txt
@@ -121,4 +121,3 @@ tests/unit/modules/conftest.py future-import-boilerplate
 tests/unit/modules/conftest.py metaclass-boilerplate
 tests/unit/modules/utils.py future-import-boilerplate
 tests/unit/modules/utils.py metaclass-boilerplate
-ci/run-ansible-tests-collection.sh shebang
diff --git a/tools/build.py b/tools/build.py
old mode 100755
new mode 100644
diff --git a/tox.ini b/tox.ini
index 104f5931..341f6460 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ commands =
 
 [testenv:build]
 commands =
-    {toxinidir}/tools/build.py
+    python {toxinidir}/tools/build.py
     ansible-galaxy collection build --force {toxinidir} --output-path {toxinidir}/build_artifact
 
 [testenv:linters]
@@ -65,4 +65,4 @@ deps =
     {toxinidir}/../openstacksdk
     ansible
 commands =
-    {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}
+    /bin/bash {toxinidir}/ci/run-ansible-tests-collection.sh -e {envdir} {posargs}