Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(QA-794) make vagrant vm size configurable through beaker #141

Merged
merged 1 commit into from
Feb 20, 2014

Conversation

anodelman
Copy link
Contributor

  • add support for a vagrant_memsize in the config file
  • default to 1024

@puppetlabs-jenkins
Copy link
Contributor

🔴 Test failed.
Refer to this link for build results: http://jenkins-beaker.delivery.puppetlabs.net/job/Beaker%20Specs/81/

@electrical
Copy link
Contributor

Yes please :-)

@colinPL
Copy link
Contributor

colinPL commented Feb 5, 2014

The docs for Vagrant (http://docs.vagrantup.com/v2/virtualbox/configuration.html) have a shorter way of setting memory (vb.memory = 1024).

@branan
Copy link
Contributor

branan commented Feb 18, 2014

@anodelman tests are failing

@anodelman
Copy link
Contributor Author

Tests on re-run were green, but didn't report here:

http://jenkins-beaker.delivery.puppetlabs.net/job/Beaker%20Specs/97/

@@ -34,7 +34,7 @@ def make_vfile hosts
@logger.debug "created Vagrantfile for VagrantHost #{host.name}"
end
v_file << " c.vm.provider :virtualbox do |vb|\n"
v_file << " vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n"
v_file << " vb.customize [\"modifyvm\", :id, \"--memory\", \"#{options['vagrant_memsize'] ||= '1024'}\"]\n"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where does vagrant_memsize come from? There doesn't seem to be a way to set it in the current code?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this will leave options['vagrant_memsize'] set to 1024 after this function exits. Is that intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in case you wish to refer to the memsize later you want to either preserve the setting selected by the user or set it to the default.

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: http://jenkins-beaker.delivery.puppetlabs.net/job/Beaker%20Specs/101/

@@ -100,7 +115,7 @@ module Beaker
before :each do
FakeFS.activate!
vagrant.stub( :randmac ).and_return( "0123456789" )
vagrant.make_vfile( @hosts )
vagrant.make_vfile( @hosts)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paren change?

- add support for a vagrant_memsize in the config file
- default to 1024
@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: http://jenkins-beaker.delivery.puppetlabs.net/job/Beaker%20Specs/102/

branan pushed a commit that referenced this pull request Feb 20, 2014
(QA-794) make vagrant vm size configurable through beaker
@branan branan merged commit 9ac309b into voxpupuli:master Feb 20, 2014
@anodelman anodelman deleted the vagrant-mem-size branch April 21, 2014 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants