openstack/openstack-ansible-os_octavia
Code Issues Proposed changes

Use the standard run_tests.sh script

Browse Source 
This patch brings over the standard run_tests.sh script that is used
in other roles.

Change-Id: I3854460ac83844570224842c67adb08efc9697d6
This commit is contained in:
Major Hayden 2017-03-08 09:45:35 -06:00
parent a8cfe63953
commit 177c4f0085
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
run_tests.sh
View File

@ -17,26 +17,29 @@ set -xeuo pipefail
FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true} FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true}
if which sudo; then # Install python2 for Ubuntu 16.04 and CentOS 7
sudo = "sudo" if which apt-get; then
else sudo apt-get update && sudo apt-get install -y python
sudo="" fi
if which yum; then
sudo yum install -y python
fi fi
# Install pip. # Install pip.
if which pip; then if ! which pip; then
curl --silent --show-error --retry 5 \ curl --silent --show-error --retry 5 \
https://bootstrap.pypa.io/get-pip.py | $sudo python2.7 https://bootstrap.pypa.io/get-pip.py | sudo python2.7
fi fi
# Install bindep and tox with pip. # Install bindep and tox with pip.
$sudo pip install bindep tox sudo pip install bindep tox
# CentOS 7 requires two additional packages: # CentOS 7 requires two additional packages:
# redhat-lsb-core - for bindep profile support # redhat-lsb-core - for bindep profile support
# epel-release - required to install python-ndg_httpsclient/python2-pyasn1 # epel-release - required to install python-ndg_httpsclient/python2-pyasn1
if which yum; then if which yum; then
$sudo yum -y install redhat-lsb-core epel-release sudo yum -y install redhat-lsb-core epel-release
fi fi
# Get a list of packages to install with bindep. If packages need to be # Get a list of packages to install with bindep. If packages need to be
@ -46,15 +49,15 @@ echo "Packages to install: ${BINDEP_PKGS}"
# Install a list of OS packages provided by bindep. # Install a list of OS packages provided by bindep.
if which apt-get; then if which apt-get; then
$sudo apt-get update sudo apt-get update
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
$sudo apt-get -q --option "Dpkg::Options::=--force-confold" \ sudo apt-get -q --option "Dpkg::Options::=--force-confold" \
--assume-yes install $BINDEP_PKGS --assume-yes install $BINDEP_PKGS
elif which yum; then elif which yum; then
# Don't run yum with an empty list of packages. # Don't run yum with an empty list of packages.
# It will fail and cause the script to exit with an error. # It will fail and cause the script to exit with an error.
if [[ ${#BINDEP_PKGS} > 0 ]]; then if [[ ${#BINDEP_PKGS} > 0 ]]; then
$sudo yum install -y $BINDEP_PKGS sudo yum install -y $BINDEP_PKGS
fi fi
fi fi