From 15ed2ec42ce5e12543b52978886b9b1c49160ba4 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 20 Apr 2017 16:25:35 +0100 Subject: [PATCH] bindep.txt: Use RedHat and SUSE platforms in bindep.txt Newest bindep supports the 'redhat' and 'suse' platforms to group together the CentOS, Fedora, RHEL and openSUSE, SUSE distributions respectively. As such, update the bindep.txt file to use these platforms and always require bindep>=2.4.0 which added support for them. Change-Id: I5490c12db46afc6ad4ec359f9274df9551881219 --- bindep.txt | 16 ++++++++-------- run_tests.sh | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/bindep.txt b/bindep.txt index 02339d5a..a351c6a1 100644 --- a/bindep.txt +++ b/bindep.txt @@ -39,17 +39,17 @@ openssl-devel [platform:rpm] python-devel [platform:rpm] # For SELinux -libselinux-python [platform:centos] -libsemanage-python [platform:centos] +libselinux-python [platform:redhat] +libsemanage-python [platform:redhat] # For SSL SNI support -python-pyasn1 [platform:dpkg platform:suselinux] -python-openssl [platform:dpkg platform:suselinux] +python-pyasn1 [platform:dpkg platform:suse] +python-openssl [platform:dpkg platform:suse] python-ndg-httpsclient [platform:ubuntu] -python2-pyasn1 [platform:centos] -python2-pyOpenSSL [platform:centos] -python-pyOpenSSL [platform:suselinux] -python-ndg_httpsclient [platform:centos] +python2-pyasn1 [platform:redhat] +python2-pyOpenSSL [platform:redhat] +python-pyOpenSSL [platform:suse] +python-ndg_httpsclient [platform:rpm] # Required for compressing collected log files in CI gzip diff --git a/run_tests.sh b/run_tests.sh index a3614343..c1b66cd7 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -43,8 +43,9 @@ if ! which pip &>/dev/null; then https://bootstrap.pypa.io/get-pip.py | sudo python2.7 fi -# Install bindep and tox -sudo pip install bindep tox +# Install bindep and tox. We need bindep>=2.4.0 because it contains the new +# redhat and suse profiles. +sudo pip install 'bindep>=2.4.0' tox # CentOS 7 requires two additional packages: # redhat-lsb-core - for bindep profile support