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.

Sign up for GitHub

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

Fixes Beaker hosts and test #55

Merged
merged 2 commits into from
Feb 18, 2016
Merged

Fixes Beaker hosts and test #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c741af
Fixes Beaker hosts
petems Feb 12, 2016
b29147d
Fixes class spec to working config
petems Feb 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions spec/acceptance/class_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
# Using puppet_apply as a helper
it 'should work idempotently with no errors' do
pp = <<-EOS
class { 'gitlab': }
class { 'gitlab':
external_url => "http://${::fqdn}",
}
EOS

# Run it twice and test for idempotency
Expand All @@ -19,8 +21,15 @@ class { 'gitlab': }
end

describe service('gitlab') do
it { is_expected.to be_enabled }
it { is_expected.to be_running }
end

it 'allows http connection on port 8080' do
shell 'sleep 15' # give it some time to start up
describe command('curl 0.0.0.0:80/users/sign_in') do
its(:stdout) { should match /GitLab/ }
end
end

end
end
11 changes: 5 additions & 6 deletions spec/acceptance/nodesets/centos-65-x64.yml → spec/acceptance/nodesets/centos-66-x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
HOSTS:
centos-65-x64:
centos-66-x64:
roles:
- master
platform: el-6-x86_64
box: puppetlabs/centos-6.5-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.5-64-nocm
hypervisor: vagrant

box: puppetlabs/centos-6.6-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-6.6-64-nocm
hypervisor : vagrant
CONFIG:
log_level: verbose
log_level: debug
type: foss
5 changes: 2 additions & 3 deletions spec/acceptance/nodesets/centos-7-x64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ HOSTS:
roles:
- master
platform: el-7-x86_64
box: chef/centos-7.0
box_url: https://vagrantcloud.com/chef/boxes/centos-7.0
box: puppetlabs/centos-7.0-64-nocm
box_url: https://vagrantcloud.com/puppetlabs/boxes/centos-7.0-64-nocm
hypervisor: vagrant

CONFIG:
log_level: verbose
type: foss