diff --git a/Berksfile b/Berksfile index ddc359185..ca9f1ef01 100644 --- a/Berksfile +++ b/Berksfile @@ -5,5 +5,8 @@ cookbook 'base', git: 'git@github.com:osuosl-cookbooks/base' cookbook 'firewall', git: 'git@github.com:osuosl-cookbooks/firewall' cookbook 'osl-haproxy', git: 'git@github.com:osuosl-cookbooks/osl-haproxy' cookbook 'osl-munin', git: 'git@github.com:osuosl-cookbooks/osl-munin' +# XXX: Remove after [1] merged +# [1] https://github.com/chef-cookbooks/jenkins/pull/603 +cookbook 'jenkins', github: 'daften/jenkins', branch: 'feature/jenkins-cli-options' metadata diff --git a/recipes/master.rb b/recipes/master.rb index df335a64c..f74a28eaa 100644 --- a/recipes/master.rb +++ b/recipes/master.rb @@ -20,7 +20,7 @@ # Don't automatically update jenkins node.override['yum-cron']['yum_parameter'] = '-x jenkins' -node.default['jenkins']['master']['version'] = '2.46.1-1.1' +node.default['jenkins']['master']['version'] = '2.46.2-1.1' node.default['jenkins']['master']['listen_address'] = '127.0.0.1' node.default['java']['jdk_version'] = '8' diff --git a/spec/unit/recipes/master_spec.rb b/spec/unit/recipes/master_spec.rb index fec8aa2a7..92e335e06 100644 --- a/spec/unit/recipes/master_spec.rb +++ b/spec/unit/recipes/master_spec.rb @@ -11,7 +11,7 @@ expect { chef_run }.to_not raise_error end it do - expect(chef_run).to install_package('jenkins').with(version: '2.46.1-1.1') + expect(chef_run).to install_package('jenkins').with(version: '2.46.2-1.1') end case p when CENTOS_6_OPTS diff --git a/test/integration/helpers/serverspec/spec_helper.rb b/test/integration/helpers/serverspec/spec_helper.rb index e4450efeb..fbcd748db 100644 --- a/test/integration/helpers/serverspec/spec_helper.rb +++ b/test/integration/helpers/serverspec/spec_helper.rb @@ -7,7 +7,7 @@ end describe package('jenkins') do - it { should be_installed.with_version('2.46.1-1.1') } + it { should be_installed.with_version('2.46.2-1.1') } end %w(80 443 8080).each do |p| @@ -22,6 +22,6 @@ end describe command('curl -k https://localhost/about/') do - its(:stdout) { should match(/Jenkins 2.46.1/) } + its(:stdout) { should match(/Jenkins 2.46.2/) } end end