openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Install python2 for Ubuntu 16.04 and CentOS 7 in Vagrant"

Browse Source
This commit is contained in:
Jenkins 2017-02-07 16:18:30 +00:00 committed by Gerrit Code Review
commit 3d3a2c3e7d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -19,7 +19,6 @@ Vagrant.configure(2) do |config|
config.vm.provision "bootstrap", type: "shell", inline: <<-SHELL
sudo su -
cd /vagrant
apt-get update
FUNCTIONAL_TEST=false ./run_tests.sh
SHELL
# Run functional tests

9
run_tests.sh
View File

@ -17,6 +17,15 @@ set -xeuo pipefail
FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true}
# Install python2 for Ubuntu 16.04 and CentOS 7
if which apt-get; then
sudo apt-get update && sudo apt-get install -y python
fi
if which yum; then
sudo yum install -y python
fi
# Install pip.
if ! which pip; then
curl --silent --show-error --retry 5 \