Remove support for RHEL 5 entirely

Signed-off-by: Tim Smith <tsmith@chef.io>
sous-chefs · Dec 19, 2016 · d64be77 · d64be77
1 parent 4e41a72
commit d64be77
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 173 deletions.
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
@@ -101,15 +101,6 @@ suites:
   #
   # client
   #
-  - name: installation_client_package-50
-    run_list:
-    - recipe[mysql_test::installation_client]
-    attributes:
-      mysql:
-       version: '5.0'
-    includes: [
-      'centos-5'
-    ]
 
   - name: installation_client_package-51
     run_list:
@@ -171,16 +162,6 @@ suites:
   #
   # server
   #
-  - name: installation_server_package-50
-    run_list:
-    - recipe[mysql_test::installation_server]
-    attributes:
-      mysql:
-       version: '5.0'
-    includes: [
-      'centos-5'
-    ]
-
   - name: installation_server_package-51
     run_list:
     - recipe[mysql_test::installation_server]
@@ -244,16 +225,6 @@ suites:
 
   # singles
 
-  - name: service50-single
-    run_list:
-    - recipe[mysql_test::service_single]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-
   - name: service51-single
     run_list:
     - recipe[mysql_test::service_single]
@@ -313,21 +284,6 @@ suites:
 
   # multi
 
-  - name: service50-multi
-    run_list:
-    - recipe[mysql_test::service_multi]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-       port: '3308'
-       data_dir: '/data/instance-2'
-       run_user: 'bob'
-       run_group: 'bob'
-       initial_root_password: 'string with spaces'
-
   - name: service51-multi
     run_list:
     - recipe[mysql_test::service_multi]
@@ -406,16 +362,6 @@ suites:
   #
   # config
   #
-  - name: config50
-    run_list:
-    - recipe[mysql_test::config]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-
   - name: config51
     run_list:
     - recipe[mysql_test::config]

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -35,15 +35,6 @@ suites:
   #
   # client
   #
-  - name: installation_client_package-50
-    run_list:
-    - recipe[mysql_test::installation_client]
-    attributes:
-      mysql:
-       version: '5.0'
-    includes: [
-      'centos-5.11'
-    ]
 
   - name: installation_client_package-51
     run_list:
@@ -105,16 +96,6 @@ suites:
   #
   # server
   #
-  - name: installation_server_package-50
-    run_list:
-    - recipe[mysql_test::installation_server]
-    attributes:
-      mysql:
-       version: '5.0'
-    includes: [
-      'centos-5.11'
-    ]
-
   - name: installation_server_package-51
     run_list:
     - recipe[mysql_test::installation_server]
@@ -178,16 +159,6 @@ suites:
 
   # singles
 
-  - name: service50-single
-    run_list:
-    - recipe[mysql_test::service_single]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-
   - name: service51-single
     run_list:
     - recipe[mysql_test::service_single]
@@ -247,21 +218,6 @@ suites:
 
   # multi
 
-  - name: service50-multi
-    run_list:
-    - recipe[mysql_test::service_multi]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-       port: '3308'
-       data_dir: '/data/instance-2'
-       run_user: 'bob'
-       run_group: 'bob'
-       initial_root_password: 'string with spaces'
-
   - name: service51-multi
     run_list:
     - recipe[mysql_test::service_multi]
@@ -340,16 +296,6 @@ suites:
   #
   # config
   #
-  - name: config50
-    run_list:
-    - recipe[mysql_test::config]
-    includes: [
-      'centos-5'
-     ]
-    attributes:
-      mysql:
-       version: '5.0'
-
   - name: config51
     run_list:
     - recipe[mysql_test::config]

diff --git a/README.md b/README.md
@@ -19,29 +19,29 @@ This cookbook is concerned with the "MySQL Community Server", particularly those
 The following platforms have been tested with Test Kitchen:
 
 ```
-|----------------+-----+-----+-----+-----+-----|
-|                | 5.0 | 5.1 | 5.5 | 5.6 | 5.7 |
-|----------------+-----+-----+-----+-----+-----|
-| debian-7       |     |     | X   |     |     |
-|----------------+-----+-----+-----+-----+-----|
-| debian-8       |     |     | X   |     |     |
-|----------------+-----+-----+-----+-----+-----|
-| ubuntu-12.04   |     |     | X   |     |     |
-|----------------+-----+-----+-----+-----+-----|
-| ubuntu-14.04   |     |     | X   | X   |     |
-|----------------+-----+-----+-----+-----+-----|
-| ubuntu-16.04   |     |     |     |     | X   |
-|----------------+-----+-----+-----+-----+-----|
-| centos-6       |     | X   | X   | X   | X   |
-|----------------+-----+-----+-----+-----+-----|
-| centos-7       |     |     | X   | X   | X   |
-|----------------+-----+-----+-----+-----+-----|
-| fedora         |     |     |     | X   | X   |
-|----------------+-----+-----+-----+-----+-----|
-| openSUSE 13.2  |     |     |     | X   |     |
-|----------------+-----+-----+-----+-----+-----|
-| openSUSE 42.1  |     |     |     | X   |     |
-|----------------+-----+-----+-----+-----+-----|
+|----------------+-----+-----+-----+-----|
+|                | 5.1 | 5.5 | 5.6 | 5.7 |
+|----------------+-----+-----+-----+-----|
+| debian-7       |     | X   |     |     |
+|----------------+-----+-----+-----+-----|
+| debian-8       |     | X   |     |     |
+|----------------+-----+-----+-----+-----|
+| ubuntu-12.04   |     | X   |     |     |
+|----------------+-----+-----+-----+-----|
+| ubuntu-14.04   |     | X   | X   |     |
+|----------------+-----+-----+-----+-----|
+| ubuntu-16.04   |     |     |     | X   |
+|----------------+-----+-----+-----+-----|
+| centos-6       | X   | X   | X   | X   |
+|----------------+-----+-----+-----+-----|
+| centos-7       |     | X   | X   | X   |
+|----------------+-----+-----+-----+-----|
+| fedora         |     |     | X   | X   |
+|----------------+-----+-----+-----+-----|
+| openSUSE 13.2  |     |     | X   |     |
+|----------------+-----+-----+-----+-----|
+| openSUSE 42.1  |     |     | X   |     |
+|----------------+-----+-----+-----+-----|
 ```
 
 ## Cookbook Dependencies

diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -2,11 +2,6 @@ module MysqlCookbook
   module HelpersBase
     require 'shellwords'
 
-    def el5?
-      return true if node['platform_family'] == 'rhel' && node['platform_version'].to_i == 5
-      false
-    end
-
     def el6?
       return true if node['platform_family'] == 'rhel' && node['platform_version'].to_i == 6
       false
@@ -63,7 +58,6 @@ def default_pid_file
 
     def default_major_version
       # rhelish
-      return '5.0' if el5?
       return '5.1' if el6?
       return '5.6' if el7?
       return '5.5' if node['platform'] == 'amazon'
@@ -96,10 +90,7 @@ def default_socket_file
     end
 
     def default_client_package_name
-      return ['mysql', 'mysql-devel'] if major_version == '5.0' && el5?
-      return ['mysql51-mysql', 'mysql51-mysql-libs'] if major_version == '5.1' && el5?
       return ['mysql', 'mysql-devel'] if major_version == '5.1' && el6?
-      return ['mysql55-mysql', 'mysql55-mysql-devel'] if major_version == '5.5' && el5?
       return ['mysql-client-5.5', 'libmysqlclient-dev'] if major_version == '5.5' && node['platform_family'] == 'debian'
       return ['mysql-client-5.6', 'libmysqlclient-dev'] if major_version == '5.6' && node['platform_family'] == 'debian'
       return ['mysql-client-5.7', 'libmysqlclient-dev'] if major_version == '5.7' && node['platform_family'] == 'debian'
@@ -108,10 +99,7 @@ def default_client_package_name
     end
 
     def default_server_package_name
-      return 'mysql-server' if major_version == '5.0' && el5?
-      return 'mysql51-mysql-server' if major_version == '5.1' && el5?
       return 'mysql-server' if major_version == '5.1' && el6?
-      return 'mysql55-mysql-server' if major_version == '5.5' && el5?
       return 'mysql-server-5.5' if major_version == '5.5' && node['platform_family'] == 'debian'
       return 'mysql-server-5.6' if major_version == '5.6' && node['platform_family'] == 'debian'
       return 'mysql-server-5.7' if major_version == '5.7' && node['platform_family'] == 'debian'

diff --git a/spec/mysql_client_installation_package_spec.rb b/spec/mysql_client_installation_package_spec.rb
@@ -4,23 +4,14 @@
   let(:installation_client_package_centos_5) { ChefSpec::ServerRunner.new(platform: 'centos', version: '5.11') }
   let(:installation_client_package_centos_6) { ChefSpec::ServerRunner.new(platform: 'centos', version: '6.8') }
   let(:installation_client_package_centos_7) { ChefSpec::ServerRunner.new(platform: 'centos', version: '7.2.1511') }
-  let(:installation_client_package_fedora_23) { ChefSpec::ServerRunner.new(platform: 'fedora', version: '23') }
-  let(:installation_client_package_debian_7) { ChefSpec::ServerRunner.new(platform: 'debian', version: '7.10') }
+  let(:installation_client_package_fedora) { ChefSpec::ServerRunner.new(platform: 'fedora', version: '24') }
+  let(:installation_client_package_debian_7) { ChefSpec::ServerRunner.new(platform: 'debian', version: '7.11') }
   let(:installation_client_package_debian_8) { ChefSpec::ServerRunner.new(platform: 'debian', version: '8.6') }
   let(:installation_client_package_ubuntu_1204) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '12.04') }
   let(:installation_client_package_ubuntu_1404) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04') }
   let(:installation_client_package_ubuntu_1604) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
 
   context 'using el5' do
-    it 'installs mysql_client_installation_package[default] when version is 5.0' do
-      installation_client_package_centos_5.node.normal['mysql']['version'] = '5.0'
-      installation_client_package_centos_5.converge(described_recipe)
-      expect(installation_client_package_centos_5).to install_mysql_client_installation_package('default').with(
-        version: '5.0',
-        package_name: ['mysql', 'mysql-devel']
-      )
-    end
-
     it 'installs mysql_client_installation_package[default] when version is 5.1' do
       installation_client_package_centos_5.node.normal['mysql']['version'] = '5.1'
       installation_client_package_centos_5.converge(described_recipe)
@@ -127,9 +118,9 @@
 
   context 'using fedora 23' do
     it 'installs mysql_client_installation_package[default] when version is 5.7' do
-      installation_client_package_fedora_23.node.normal['mysql']['version'] = '5.7'
-      installation_client_package_fedora_23.converge(described_recipe)
-      expect(installation_client_package_fedora_23).to install_mysql_client_installation_package('default').with(
+      installation_client_package_fedora.node.normal['mysql']['version'] = '5.7'
+      installation_client_package_fedora.converge(described_recipe)
+      expect(installation_client_package_fedora).to install_mysql_client_installation_package('default').with(
         version: '5.7',
         package_name: ['mysql-community-client', 'mysql-community-devel']
       )

diff --git a/spec/mysql_server_installation_package_spec.rb b/spec/mysql_server_installation_package_spec.rb
@@ -4,23 +4,14 @@
   let(:installation_server_package_centos_5) { ChefSpec::ServerRunner.new(platform: 'centos', version: '5.11') }
   let(:installation_server_package_centos_6) { ChefSpec::ServerRunner.new(platform: 'centos', version: '6.7') }
   let(:installation_server_package_centos_7) { ChefSpec::ServerRunner.new(platform: 'centos', version: '7.0') }
-  let(:installation_server_package_fedora_23) { ChefSpec::ServerRunner.new(platform: 'fedora', version: '23') }
+  let(:installation_server_package_fedora) { ChefSpec::ServerRunner.new(platform: 'fedora', version: '23') }
   let(:installation_server_package_debian_7) { ChefSpec::ServerRunner.new(platform: 'debian', version: '7.9') }
   let(:installation_server_package_debian_8) { ChefSpec::ServerRunner.new(platform: 'debian', version: '8.2') }
   let(:installation_server_package_ubuntu_1204) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '12.04') }
   let(:installation_server_package_ubuntu_1404) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '14.04') }
   let(:installation_server_package_ubuntu_1604) { ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04') }
 
   context 'using el5' do
-    it 'installs mysql_server_installation_package[default] when version is 5.0' do
-      installation_server_package_centos_5.node.normal['mysql']['version'] = '5.0'
-      installation_server_package_centos_5.converge(described_recipe)
-      expect(installation_server_package_centos_5).to install_mysql_server_installation_package('default').with(
-        version: '5.0',
-        package_name: 'mysql-server'
-      )
-    end
-
     it 'installs mysql_server_installation_package[default] when version is 5.1' do
       installation_server_package_centos_5.node.normal['mysql']['version'] = '5.1'
       installation_server_package_centos_5.converge(described_recipe)
@@ -127,18 +118,18 @@
 
   context 'using fedora 23' do
     it 'installs mysql_server_installation_package[default] when version is 5.6' do
-      installation_server_package_fedora_23.node.normal['mysql']['version'] = '5.6'
-      installation_server_package_fedora_23.converge(described_recipe)
-      expect(installation_server_package_fedora_23).to install_mysql_server_installation_package('default').with(
+      installation_server_package_fedora.node.normal['mysql']['version'] = '5.6'
+      installation_server_package_fedora.converge(described_recipe)
+      expect(installation_server_package_fedora).to install_mysql_server_installation_package('default').with(
         version: '5.6',
         package_name: 'mysql-community-server'
       )
     end
 
     it 'installs mysql_server_installation_package[default] when version is 5.7' do
-      installation_server_package_fedora_23.node.normal['mysql']['version'] = '5.7'
-      installation_server_package_fedora_23.converge(described_recipe)
-      expect(installation_server_package_fedora_23).to install_mysql_server_installation_package('default').with(
+      installation_server_package_fedora.node.normal['mysql']['version'] = '5.7'
+      installation_server_package_fedora.converge(described_recipe)
+      expect(installation_server_package_fedora).to install_mysql_server_installation_package('default').with(
         version: '5.7',
         package_name: 'mysql-community-server'
       )