Skip to content

Commit

Permalink
Updating to 2.46.2
Browse files Browse the repository at this point in the history
This provides several security updates.
  • Loading branch information
ramereth committed May 1, 2017
1 parent 139c8ef commit 717955b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Berksfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@ cookbook 'base', git: '[email protected]:osuosl-cookbooks/base'
cookbook 'firewall', git: '[email protected]:osuosl-cookbooks/firewall'
cookbook 'osl-haproxy', git: '[email protected]:osuosl-cookbooks/osl-haproxy'
cookbook 'osl-munin', git: '[email protected]: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
2 changes: 1 addition & 1 deletion recipes/master.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/recipes/master_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/helpers/serverspec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand All @@ -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

0 comments on commit 717955b

Please sign in to comment.