From a2a78e7ef56140602d5d00adbf31ec59e9ba40e3 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 2 Dec 2020 11:20:52 -0500 Subject: [PATCH] Ensure we have python installed for testing Also fix / ignore linting errors. Change-Id: I9bb1b658a1e731f1d61753b958f3c23dc45f3542 Signed-off-by: Paul Belanger --- bindep.txt | 7 ++++--- tests/collect-logs.yaml | 1 + tox.ini | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bindep.txt b/bindep.txt index f7dfaa9..1d1b05b 100644 --- a/bindep.txt +++ b/bindep.txt @@ -4,13 +4,14 @@ git libffi-dev [platform:dpkg] libffi-devel [platform:rpm] -libselinux-python [platform:rpm] libssl-dev [platform:dpkg] openssl-devel [platform:rpm] -python2-dnf [platform:fedora] +python3-dnf [platform:fedora] +python3-libselinux [platform:rpm] +python3-pip [test] +python3-setuptools [test] # NOTE(pabelanger): This is because of a bug in zuul, when zuul-scheduler starts # it will fail unless it cannot connect to zookeeper. However, zuul should be # smart enough to try forever to connect. zookeeperd [platform:dpkg] -zookeeper [platform:fedora] diff --git a/tests/collect-logs.yaml b/tests/collect-logs.yaml index b38b3d8..da32bd0 100644 --- a/tests/collect-logs.yaml +++ b/tests/collect-logs.yaml @@ -6,6 +6,7 @@ - name: Ensure journald logs directory exists file: + mode: 0755 path: "{{ __log_dir }}" state: directory diff --git a/tox.ini b/tox.ini index 52babe3..5f70fca 100644 --- a/tox.ini +++ b/tox.ini @@ -37,7 +37,7 @@ commands = flake8 # Ansible Lint Check bash -c "find . -not -path '*/\.*' -type f -regex '.*.y[a]?ml' -print0 | \ - xargs -t -n1 -0 ansible-lint -x 306" + xargs -t -n1 -0 ansible-lint -x 106,306" # Ansible Syntax Check bash -c "find tests -type f -regex '.*.y[a]?ml' -print | xargs -t -n1 \ ansible-playbook --syntax-check -i tests/inventory \