From cfc6ec77473273b166c1e02c54bc39f57ad83362 Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 7 May 2015 00:34:24 -0700 Subject: [PATCH] Add vagrant nodeset and make it the default Added an Ubuntu nodeset stolen from the puppetlabs apache module. The box_url is necessary even though the box is namespaced, vagrant seems to have changed recently and just having the vagrant cloud namespace in the box name is not enough to import the box. We're making this nodeset the default so that a developer can have it "just work" on their laptop. CI will be configured to use a nodepool nodeset. Following the example of the puppetlabs modules, the default nodeset is a copy of the new ubuntu nodeset so that setting BEAKER_set=ubuntu-server-1404-x64 still works. Fixed an error in the README (correct environment variable is BEAKER_set not BEAKER_setfile) and added more details. Change-Id: Ib3e50ffbaf613dd2e6582904efeff1d7cce77bb5 --- README.md | 8 ++++++-- spec/acceptance/nodesets/default.yml | 10 ++++++---- spec/acceptance/nodesets/ubuntu-server-1404-x64.yml | 11 +++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 spec/acceptance/nodesets/ubuntu-server-1404-x64.yml diff --git a/README.md b/README.md index c6b3797a9..85635bd76 100644 --- a/README.md +++ b/README.md @@ -88,13 +88,17 @@ Beaker-Rspec This module has beaker-rspec tests -To run: +To run the tests on the default vagrant node: ```shell bundle install -BEAKER_setfile=default bundle exec rspec spec/acceptance +bundle exec rspec spec/acceptance ``` +For more information on writing and running beaker-rspec tests visit the documentation: + +* https://github.com/puppetlabs/beaker/wiki/How-to-Write-a-Beaker-Test-for-a-Module + Contributors ------------ diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index a2c1ecc63..cba1cd04c 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -1,9 +1,11 @@ HOSTS: - ubuntu-14.04-amd64: + ubuntu-server-1404-x64: roles: - master platform: ubuntu-14.04-amd64 - hypervisor : none - ip: 127.0.0.1 + box : puppetlabs/ubuntu-14.04-64-nocm + box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm + hypervisor : vagrant CONFIG: - type: foss + log_level : debug + type: git diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml new file mode 100644 index 000000000..cba1cd04c --- /dev/null +++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml @@ -0,0 +1,11 @@ +HOSTS: + ubuntu-server-1404-x64: + roles: + - master + platform: ubuntu-14.04-amd64 + box : puppetlabs/ubuntu-14.04-64-nocm + box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm + hypervisor : vagrant +CONFIG: + log_level : debug + type: git