openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Install python2 for Ubuntu 16.04 and CentOS 7 in Vagrant

Browse Source 
- Handle apt-get update in run_tests.sh
- Install python2 for Ubuntu 16.04 and CentOS 7 before executing test
  script.

Change-Id: I439934a463858f46647d8b00467076fbf8f12416
This commit is contained in:
Cuong Nguyen 2017-02-07 10:42:22 +07:00
parent 915606bbf0
commit cbb2e6ecd3
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 config.vm.provision "bootstrap", type: "shell", inline: <<-SHELL
sudo su - sudo su -
cd /vagrant cd /vagrant
apt-get update
FUNCTIONAL_TEST=false ./run_tests.sh FUNCTIONAL_TEST=false ./run_tests.sh
SHELL SHELL
# Run functional tests # Run functional tests

9
run_tests.sh
View File

@ -17,6 +17,15 @@ set -xeuo pipefail
FUNCTIONAL_TEST=${FUNCTIONAL_TEST:-true} 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. # Install pip.
if ! which pip; then if ! which pip; then
curl --silent --show-error --retry 5 \ curl --silent --show-error --retry 5 \