diff --git a/spec/acceptance/fixtures/slave.pp b/spec/acceptance/fixtures/slave.pp index c997da6..8caf1db 100644 --- a/spec/acceptance/fixtures/slave.pp +++ b/spec/acceptance/fixtures/slave.pp @@ -4,8 +4,8 @@ class { '::jenkins::slave': class { '::jenkins::job_builder': url => "https://${::fqdn}", - username => 'jenkins', - password => 'secret', + username => 'admin', + password => '<>', jenkins_jobs_update_timeout => 1200, config_dir => '/etc/project-config/jenkins', require => Class['::jenkins::slave'], diff --git a/spec/acceptance/slave_spec.rb b/spec/acceptance/slave_spec.rb index c2e5e64..694f6ce 100644 --- a/spec/acceptance/slave_spec.rb +++ b/spec/acceptance/slave_spec.rb @@ -11,9 +11,13 @@ describe 'puppet-jenkins slave module', :if => ['debian', 'ubuntu'].include?(os[ File.read(module_path) end + def default_password + command('/bin/cat /var/lib/jenkins/secrets/initialAdminPassword').stdout.chomp + end + def jenkins_slave_puppet_module module_path = File.join(pp_path, 'slave.pp') - File.read(module_path) + File.read(module_path).gsub('<>', default_password) end before(:all) do