From d661ad4042b354cce44a2533ecf496e15dd15ae5 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Mon, 1 Oct 2018 14:02:45 -0500 Subject: [PATCH] Add zuul to the linters tox env So that the syntax check which runs on playbooks can find zuul_return. Add re2 library to bindep, it's needed for zuul. Change-Id: I93213ee19652c0ec9f4bc699204e9445a1e891c8 --- bindep.txt | 7 +++++++ test-requirements.txt | 1 + tox.ini | 2 ++ 3 files changed, 10 insertions(+) diff --git a/bindep.txt b/bindep.txt index 5ae393821..b06baa3ba 100644 --- a/bindep.txt +++ b/bindep.txt @@ -10,3 +10,10 @@ libffi-dev [platform:dpkg] libffi-devel [platform:rpm] python-dev [platform:dpkg] python-devel [platform:rpm] +libre2-dev [compile test platform:dpkg] +libre2-4 [platform:ubuntu-bionic] +libre2-3 [platform:debian-stretch] +libre2-1v5 [platform:ubuntu-xenial] +re2-devel [compile test platform:rpm] +re2-dev [platform:apk] +re2 [platform:rpm platform:apk] diff --git a/test-requirements.txt b/test-requirements.txt index d7feb5675..25adbc263 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,6 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. flake8 +zuul # We need to pin the ansible version directly here; per the # deprecation policy it should trail the version used by Zuul by 4 diff --git a/tox.ini b/tox.ini index 8419ce0e7..3e3dbdea7 100644 --- a/tox.ini +++ b/tox.ini @@ -31,6 +31,8 @@ passenv = # to export ANSIBLE_ROLES_PATH pointing to the currect repos. # see openstack-zuul-jobs-linters job for more information. ANSIBLE_ROLES_PATH +setenv = + ANSIBLE_LIBRARY= {envdir}/src/zuul/zuul/ansible/library whitelist_externals = bash commands = flake8 {posargs}