From d8b1a08d1e73a71aa34b29a2d116fe85e0dd2fe8 Mon Sep 17 00:00:00 2001 From: Al Bailey Date: Mon, 21 Nov 2022 15:35:42 +0000 Subject: [PATCH] Fix openstack-tox jobs for DC repo Bindep updates are required to get cffi to install on ubuntu-jammy. This update adds a bindep.txt to ensure Zuul will install the required third party entries The Zuul upper-constraints env variable declaration needed to be added to tox.ini otherwise an older constraints was being used which does not work with newer versions of python. Partial-Bug: #1997255 Signed-off-by: Al Bailey Change-Id: I7e4b032f9c91bfaab33fec49f23613004101f44b --- bindep.txt | 10 ++++++++++ tox.ini | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt new file mode 100644 index 000000000..3ffe69f3f --- /dev/null +++ b/bindep.txt @@ -0,0 +1,10 @@ +# This is a cross-platform list tracking distribution packages needed for install and tests; +# see https://docs.openstack.org/infra/bindep/ for additional information. + +libffi-dev [platform:dpkg] +libldap2-dev [platform:dpkg] +libxml2-dev [platform:dpkg] +libxslt1-dev [platform:dpkg] +libsasl2-dev [platform:dpkg] +libffi-devel [platform:rpm] +python3-all-dev [platform:dpkg] diff --git a/tox.ini b/tox.ini index 0ffd6fdb0..b191ced6b 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ skipsdist = True [testenv] install_command = pip install -v -v -v \ - -c https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt \ + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt} \ {opts} {packages} setenv = VIRTUAL_ENV={envdir}