From cffd4fc9d41b15c31610dee4abd8786916f5933b Mon Sep 17 00:00:00 2001 From: Luke Short Date: Mon, 21 Oct 2019 09:30:38 -0400 Subject: [PATCH] Workaround for ansible-lint installation failure Bug: https://bugs.launchpad.net/tripleo/+bug/1848512 Bug: https://github.com/ansible/ansible-lint/issues/590 Change-Id: I26fa196ff9851106c926ae127491b7e464781836 Signed-off-by: Sorin Sbarnea --- bindep.txt | 12 ++++++------ tox.ini | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bindep.txt b/bindep.txt index f24d053cd..668bd4047 100644 --- a/bindep.txt +++ b/bindep.txt @@ -18,15 +18,15 @@ gcc-c++ [platform:rpm] git [platform:rpm] libffi-devel [platform:rpm] openssl-devel [platform:rpm] -python-devel [platform:rpm !platform:rhel-8] -python3-devel [platform:rpm !platform:centos-7] +python-devel [platform:rpm !platform:rhel-8 !platform:centos-8] +python3-devel [platform:rpm !platform:rhel-7 !platform:centos-7] python2-dnf [platform:fedora] # For SELinux -libselinux-python [platform:rpm !platform:rhel-8] -libsemanage-python [platform:redhat !platform:rhel-8] -libselinux-python3 [platform:rpm !platform:centos-7] -libsemanage-python3 [platform:redhat !platform:rhel-7] +libselinux-python [platform:rpm !platform:rhel-8 !platform:centos-8] +libsemanage-python [platform:redhat !platform:rhel-8 !platform:centos-8] +libselinux-python3 [platform:rpm !platform:rhel-7 !platform:centos-7] +libsemanage-python3 [platform:redhat !platform:rhel-7 !platform:centos-7] # Required for compressing collected log files in CI gzip diff --git a/tox.ini b/tox.ini index 1f3b8ea7d..e8378f433 100644 --- a/tox.ini +++ b/tox.ini @@ -82,7 +82,9 @@ deps = -r {toxinidir}/molecule-requirements.txt commands = {[testenv:pep8]commands} - {[testenv:ansible-lint]commands} + #TODO(ekultails): Re-enable after this is fixed + # https://github.com/ansible/ansible-lint/issues/590 + #{[testenv:ansible-lint]commands} {[testenv:bashate]commands} {[testenv:yamllint]commands} {[testenv:whitespace]commands}