aahmed-se closed pull request #2872: Update to use use new vagrant images URL: https://github.com/apache/pulsar/pull/2872
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/pulsar-client-cpp/python/pkg/osx/build.sh.template b/pulsar-client-cpp/python/pkg/osx/build.sh.template index 7e8374e051..033aa3918b 100755 --- a/pulsar-client-cpp/python/pkg/osx/build.sh.template +++ b/pulsar-client-cpp/python/pkg/osx/build.sh.template @@ -25,23 +25,16 @@ PYTHONVER=#PYTHONVER# BOOST_VERSION=1.67 -/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" - -brew install openssl git boost@$BOOST_VERSION pkg-config jsoncpp cmake protobuf260 - -brew link --force boost@$BOOST_VERSION - if [ "$PYTHONVER" = "PYTHON2" ] then - brew install python@2 boost-python@$BOOST_VERSION - brew link --force boost-python@$BOOST_VERSION + brew link --force python@2 fi if [ "$PYTHONVER" = "PYTHON3" ] then - brew install python boost-python3 brew link --force boost-python3 + brew link --force python fi brew link --force protobuf260 diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.11-python2.7/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.11-python2.7/Vagrantfile index 332b0ea10e..51503adf9b 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.11-python2.7/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.11-python2.7/Vagrantfile @@ -20,8 +20,9 @@ # Vagrant.configure("2") do |config| - config.vm.box = "jhcook/osx-elcapitan-10.11" + config.vm.box = "aahmed-se/osx-10.11-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.11-python2.7" end diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.11-python3.6/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.11-python3.6/Vagrantfile index deb94bb2a3..cc2a9af58e 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.11-python3.6/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.11-python3.6/Vagrantfile @@ -20,8 +20,9 @@ # Vagrant.configure("2") do |config| - config.vm.box = "jhcook/osx-elcapitan-10.11" + config.vm.box = "aahmed-se/osx-10.11-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.11-python3.6" end diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.12-python2.7/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.12-python2.7/Vagrantfile index 297a5b82be..cd859629cf 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.12-python2.7/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.12-python2.7/Vagrantfile @@ -20,8 +20,9 @@ # Vagrant.configure("2") do |config| - config.vm.box = "jhcook/macos-sierra" + config.vm.box = "aahmed-se/osx-10.12-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.12-python2.7" end diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.12-python3.6/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.12-python3.6/Vagrantfile index 502c44f5a7..f084e40443 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.12-python3.6/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.12-python3.6/Vagrantfile @@ -20,8 +20,9 @@ # Vagrant.configure("2") do |config| - config.vm.box = "jhcook/macos-sierra" + config.vm.box = "aahmed-se/osx-10.12-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.12-python3.6" end diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.13-python2.7/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.13-python2.7/Vagrantfile index 13b2646643..2b7c0699f1 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.13-python2.7/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.13-python2.7/Vagrantfile @@ -20,9 +20,10 @@ # Vagrant.configure("2") do |config| - config.vm.box = "burinkhazad/macos-high-sierra" + config.vm.box = "aahmed-se/osx-10.13-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false config.vm.synced_folder ".", "/vagrant", disabled: true + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.13-python2.7" end diff --git a/pulsar-client-cpp/python/pkg/osx/osx-10.13-python3.6/Vagrantfile b/pulsar-client-cpp/python/pkg/osx/osx-10.13-python3.6/Vagrantfile index 5bfc25b020..685420f927 100644 --- a/pulsar-client-cpp/python/pkg/osx/osx-10.13-python3.6/Vagrantfile +++ b/pulsar-client-cpp/python/pkg/osx/osx-10.13-python3.6/Vagrantfile @@ -20,9 +20,10 @@ # Vagrant.configure("2") do |config| - config.vm.box = "burinkhazad/macos-high-sierra" + config.vm.box = "aahmed-se/osx-10.13-python-dev" config.vm.provision "shell", path: "build.sh", privileged: false config.vm.synced_folder ".", "/vagrant", disabled: true + config.vm.synced_folder ".", "/vagrant", disabled: true config.vm.provider :virtualbox do |vb| vb.name = "osx-10.13-python3.6" end ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
