Install python2 for Ubuntu 16.04 and CentOS 7 in Vagrant
- Phase out trusty in Vagrantfile - Install python2 for Ubuntu 16.04 and CentOS 7 before executing test script. Change-Id: Ie9aeb9e7be82d141293483b98834462d234514d5
This commit is contained in:
parent
1797aea3bf
commit
713c779045
|
@ -3,15 +3,6 @@ Vagrant.configure(2) do |config|
|
|||
v.memory = 2048
|
||||
v.cpus = 2
|
||||
end
|
||||
config.vm.define "ubuntu1404" do |trusty|
|
||||
trusty.vm.box = "ubuntu/trusty64"
|
||||
trusty.vm.provision "shell", inline: <<-SHELL
|
||||
sudo su -
|
||||
cd /vagrant
|
||||
./run_tests.sh
|
||||
SHELL
|
||||
end
|
||||
|
||||
config.vm.define "ubuntu1604" do |xenial|
|
||||
xenial.vm.box = "ubuntu/xenial64"
|
||||
xenial.vm.provision "shell", inline: <<-SHELL
|
||||
|
|
|
@ -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 \
|
||||
|
|
Loading…
Reference in New Issue