From fe6b09701d848f1a55e5b5b750620de48d687de3 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Sat, 14 Feb 2015 09:43:25 -0600 Subject: [PATCH 1/2] 3.4.4 was released and this is the update --- attributes/default.rb | 2 +- metadata.rb | 2 +- spec/default_spec.rb | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 3224562e..9222decf 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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 diff --git a/metadata.rb b/metadata.rb index ce85472e..70af086c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/spec/default_spec.rb b/spec/default_spec.rb index e4965a8a..39dbdc80 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From a6b0e7a70b9bf901b054d853ad48415d2729a5f1 Mon Sep 17 00:00:00 2001 From: Seth Thomas Date: Wed, 25 Feb 2015 16:36:04 -0800 Subject: [PATCH 2/2] Excluding centos 6/7 from the distro version suite --- .kitchen.cloud.yml | 1 + .kitchen.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.kitchen.cloud.yml b/.kitchen.cloud.yml index b445f981..8ac4f631 100644 --- a/.kitchen.cloud.yml +++ b/.kitchen.cloud.yml @@ -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] diff --git a/.kitchen.yml b/.kitchen.yml index 334cf943..854f4795 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -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]