Skip to content

Commit

Permalink
Merge pull request #223 from jjasghar/3.4.4
Browse files Browse the repository at this point in the history
3.4.4 was released and this is the update
  • Loading branch information
Seth Thomas committed Feb 26, 2015
2 parents eab8bc1 + a6b0e7a commit 5ad2255
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
1 change: 1 addition & 0 deletions .kitchen.cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ suites:
attributes:
rabbitmq:
use_distro_version: true
excludes: ["centos-6-5-x64", "centos-7-0-x64"]
- name: cluster
run_list:
- recipe[rabbitmq::default]
Expand Down
1 change: 1 addition & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ suites:
attributes:
rabbitmq:
use_distro_version: true
excludes: ["centos-6.5", "centos-7.0"]
- name: cluster
run_list:
- recipe[rabbitmq::default]
Expand Down
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Latest RabbitMQ.com version to install
default['rabbitmq']['version'] = '3.4.3'
default['rabbitmq']['version'] = '3.4.4'
# The distro versions may be more stable and have back-ported patches
default['rabbitmq']['use_distro_version'] = false
# Allow the distro version to be optionally pinned like the rabbitmq.com version
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email 'cookbooks@chef.io'
license 'Apache 2.0'
description 'Installs and configures RabbitMQ server'
version '3.10.0'
version '3.11.0'
recipe 'rabbitmq', 'Install and configure RabbitMQ'
recipe 'rabbitmq::cluster', 'Set up RabbitMQ clustering.'
recipe 'rabbitmq::plugin_management', 'Manage plugins with node attributes'
Expand Down
32 changes: 16 additions & 16 deletions spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
let(:runner) { ChefSpec::ServerRunner.new(UBUNTU_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
node.set['rabbitmq']['version'] = '3.4.3'
node.set['rabbitmq']['version'] = '3.4.4'
runner.converge(described_recipe)
end

Expand All @@ -87,11 +87,11 @@
end

it 'creates a rabbitmq-server deb in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.4.3-1_all.deb')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server_3.4.4-1_all.deb')
end

it 'installs the rabbitmq-server deb_package with the default action' do
expect(chef_run).to install_dpkg_package('/tmp/rabbitmq-server_3.4.3-1_all.deb')
expect(chef_run).to install_dpkg_package('/tmp/rabbitmq-server_3.4.4-1_all.deb')
end

describe 'uses distro version' do
Expand All @@ -117,13 +117,13 @@
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

describe 'uses distro version' do
Expand Down Expand Up @@ -164,13 +164,13 @@
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

it 'includes the `yum-epel` recipe' do
Expand All @@ -195,18 +195,18 @@
let(:runner) { ChefSpec::ServerRunner.new(FEDORA_OPTS) }
let(:node) { runner.node }
let(:chef_run) do
node.set['rabbitmq']['version'] = '3.4.3'
node.set['rabbitmq']['version'] = '3.4.4'
runner.converge(described_recipe)
end

it 'creates a rabbitmq-server rpm in the cache path' do
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to create_remote_file_if_missing('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not create_remote_file_if_missing('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

it 'installs the rabbitmq-server rpm_package with the default action' do
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.3-1.noarch.rpm')
expect(chef_run).to install_rpm_package('/tmp/rabbitmq-server-3.4.4-1.noarch.rpm')
expect(chef_run).to_not install_rpm_package('/tmp/not-rabbitmq-server-3.4.4-1.noarch.rpm')
end

describe 'uses distro version' do
Expand Down

0 comments on commit 5ad2255

Please sign in to comment.