Skip to content
Snippets Groups Projects
Commit 2e557937 authored by Fabien Combernous's avatar Fabien Combernous
Browse files

Merge branch '1-ci-is-failing' into 'master'

Resolve "CI is failing"

Closes #1

See merge request !1
parents 699e8eae 2241137c
No related branches found
No related tags found
Loading
Checking pipeline status
...@@ -41,7 +41,7 @@ acceptance with Puppet5 Ubuntu1804: ...@@ -41,7 +41,7 @@ acceptance with Puppet5 Ubuntu1804:
BEAKER_IS_PE: 'no' BEAKER_IS_PE: 'no'
BEAKER_PUPPET_COLLECTION: 'puppet5' BEAKER_PUPPET_COLLECTION: 'puppet5'
BEAKER_debug: 'true' BEAKER_debug: 'true'
BEAKER_setfile: 'ubuntu1804-64' BEAKER_setfile: 'ubuntu1804-64ssp.m{hostname=ssp.example.com}-centos7-64ipa.a{hostname=ipa.example.com}'
BEAKER_HYPERVISOR: 'docker' BEAKER_HYPERVISOR: 'docker'
script: script:
- bundle exec rake beaker - bundle exec rake beaker
......
...@@ -39,7 +39,7 @@ appveyor.yml: ...@@ -39,7 +39,7 @@ appveyor.yml:
BEAKER_IS_PE: 'no' BEAKER_IS_PE: 'no'
BEAKER_PUPPET_COLLECTION: 'puppet5' BEAKER_PUPPET_COLLECTION: 'puppet5'
BEAKER_debug: 'true' BEAKER_debug: 'true'
BEAKER_setfile: 'ubuntu1804-64' BEAKER_setfile: 'ubuntu1804-64ssp.m{hostname=ssp.example.com}-centos7-64ipa.a{hostname=ipa.example.com}'
BEAKER_HYPERVISOR: 'docker' BEAKER_HYPERVISOR: 'docker'
script: script:
- bundle exec rake beaker - bundle exec rake beaker
......
...@@ -4,41 +4,26 @@ ipa_ip = fact_on('ipa', 'networking.ip') ...@@ -4,41 +4,26 @@ ipa_ip = fact_on('ipa', 'networking.ip')
describe 'ssp class' do describe 'ssp class' do
context 'with minimal parameters' do context 'with minimal parameters' do
hosts_as('ssp').each do |ssp| it 'applies idempotently' do
it 'applies idempotently' do pp = %(
pp = %( class { 'ssp' :
class { 'ssp' : system_owner => 'ssp',
system_owner => 'ssp', ldap_binddn => 'uid=bindssp,cn=sysaccounts,cn=etc,dc=example,dc=com',
ldap_binddn => 'uid=bindssp,cn=sysaccounts,cn=etc,dc=example,dc=com', ldap_bindpw => 'bindpw',
ldap_bindpw => 'bindpw', ldap_base => 'cn=users,cn=accounts,dc=example,dc=com',
ldap_base => 'cn=users,cn=accounts,dc=example,dc=com', ldap_whochange_pw => 'admin',
ldap_whochange_pw => 'admin', mail_from => 'admin@example.com',
mail_from => 'admin@example.com', manage_git => true,
manage_git => true, ldap_url => ['ldap://#{ipa_ip}'],
ldap_url => ['ldap://#{ipa_ip}'], }
} )
)
apply_manifest(pp, catch_failures: true) apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true) apply_manifest(pp, catch_changes: true)
end end
describe command('curl -c /tmp/passwd-change -d "login=jsmith" -d "oldpassword=oldsecret" -d "newpassword=newsecret" -d "confirmpassword=newsecret" http://localhost') do describe command('curl -c /tmp/passwd-change -d "login=jsmith" -d "oldpassword=oldsecret" -d "newpassword=newsecret" -d "confirmpassword=newsecret" http://localhost') do
its(:stdout) { is_expected.to match %r{Your password was changed} } its(:stdout) { is_expected.to match %r{Your password was changed} }
end
end end
#
# hosts_as('ipa').each do |ipa|
# it 'uses newsecret' do
# pp = <<-EOS
# exec { 'kinit jsmith newsecret':
# path => '/bin/',
# command => 'echo newsecret | kinit jsmith',
# }
# EOS
#
# apply_manifest_on(ipa, pp, catch_failures: true)
# end
# end
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment