jenkins-bot has submitted this change and it was merged. Change subject: Fetch a working trusty box on VMWare Fusion provider ......................................................................
Fetch a working trusty box on VMWare Fusion provider MediaWiki-Vagrant wasn't working under Hashi's proprietary VMWare Fusion provider because the configuration is fetching from a VirtualBox-only box source. Added conditional configuration for virtualbox (setting the one we were using unconditionally before) and vmware_fusion (fetching puphpet's trusty box as reported working on bug). Also included some VM option setting from the config patch on the bug, adjusted for current version/format. Based on config patch from bug: https://bugzilla.wikimedia.org/attachment.cgi?id=15245 Bug: 59904 Change-Id: Ia34ec94e286435a381e8ef8f71289530b9cf5067 --- M Vagrantfile 1 file changed, 17 insertions(+), 3 deletions(-) Approvals: Parent5446: Looks good to me, approved jenkins-bot: Verified diff --git a/Vagrantfile b/Vagrantfile index fbc8f55..c58fcfb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -56,9 +56,15 @@ config.vm.hostname = 'mediawiki-vagrant.dev' config.package.name = 'mediawiki.box' - config.vm.box = 'trusty-cloud' - config.vm.box_url = 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box' - config.vm.box_download_insecure = true + config.vm.provider :virtualbox do |vb, override| + override.vm.box = 'trusty-cloud' + override.vm.box_url = 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box' + override.vm.box_download_insecure = true + end + + config.vm.provider :vmware_fusion do |vw, override| + override.vm.box = 'puphpet/ubuntu1404-x64' + end config.vm.network :private_network, ip: settings[:static_ip] @@ -112,6 +118,14 @@ # vb.gui = true end + config.vm.provider :vmware_fusion do |vw| + vw.vmx["memsize"] = settings[:vagrant_ram] + vw.vmx["numvcpus"] = settings[:vagrant_cores] + + # To boot the VM in graphical mode, uncomment the following line: + #vw.gui = true + end + config.vm.provision :puppet do |puppet| puppet.module_path = 'puppet/modules' puppet.manifests_path = 'puppet/manifests' -- To view, visit https://gerrit.wikimedia.org/r/147880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia34ec94e286435a381e8ef8f71289530b9cf5067 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: Parent5446 <tylerro...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
