From 713c77904535c0aa98b8d445e490eb3269799a35 Mon Sep 17 00:00:00 2001 From: Cuong Nguyen Date: Thu, 9 Feb 2017 10:36:09 +0700 Subject: [PATCH] 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 --- Vagrantfile | 9 --------- run_tests.sh | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index f5db13f..e2f19b2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -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 diff --git a/run_tests.sh b/run_tests.sh index 44b0404..94ccf8b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -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 \