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
This commit is contained in:
parent
c9d2866b57
commit
97eb24ac4d
1
ci/run-ansible-tests-collection.sh
Executable file → Normal file
1
ci/run-ansible-tests-collection.sh
Executable file → Normal file
@ -1,4 +1,3 @@
|
||||
#!/bin/bash
|
||||
#############################################################################
|
||||
# run-ansible-tests.sh
|
||||
#
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
0
tools/build.py
Executable file → Normal file
0
tools/build.py
Executable file → Normal file
4
tox.ini
4
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}
|
||||
|
Loading…
Reference in New Issue
Block a user