openstack
/
openstack-ansible-tests
Code Issues Proposed changes

Don't install redhat-lsb-core twice 

This patch puts both of the yum install tasks together and avoids
a request for installing redhat-lsb-core twice.

Change-Id: Ib26f5890cdb17a1b10a689c66c377051faefc939
This commit is contained in:
Major Hayden 2017-08-03 10:57:14 -05:00
parent 4e3d92e715
commit 94358836b3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
run_tests_common.sh
View File

@ -31,7 +31,7 @@ case "${ID,,}" in
sudo zypper -n in python-devel lsb-release ${extra_suse_deps:-}
;;
amzn|centos|rhel)
sudo $RHT_PKG_MGR install -y python-devel redhat-lsb-core
sudo $RHT_PKG_MGR install -y python-devel redhat-lsb-core epel-release yum-utils
;;
ubuntu|debian)
sudo apt-get update && sudo apt-get install -y python-dev lsb-release
@ -50,11 +50,7 @@ fi
# Install bindep and tox
sudo pip install 'bindep>=2.4.0' tox
# CentOS 7 requires two additional packages:
# redhat-lsb-core - for bindep profile support
# epel-release - required to install python-ndg_httpsclient/python2-pyasn1
if [[ ${ID,,} == "centos" ]]; then
sudo $RHT_PKG_MGR -y install redhat-lsb-core epel-release yum-utils
# epel-release could be installed but not enabled (which is very common
# in openstack-ci) so enable it here if needed
sudo yum-config-manager --enable epel || true