diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba33cfb..49a4563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,6 @@ jobs: - 'amazonlinux-2' - 'debian-9' - 'debian-10' - - 'centos-6' - 'centos-7' - 'centos-8' - 'fedora-latest' diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d6f14e..fcddf3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Yamllint fixes - MDL fixes +### Removed + +- Remove EL 6 testing + ## 5.3.1 (2018-07-24) - Fixed sbin issue with Chef13 diff --git a/kitchen.dokken.yml b/kitchen.dokken.yml index a981fe8..a4894be 100644 --- a/kitchen.dokken.yml +++ b/kitchen.dokken.yml @@ -40,11 +40,6 @@ platforms: intermediate_instructions: - RUN /usr/bin/apt-get update - - name: centos-6 - driver: - image: dokken/centos-6 - pid_one_command: /sbin/init - - name: centos-7 driver: image: dokken/centos-7 diff --git a/kitchen.yml b/kitchen.yml index 470e898..4e6d48f 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -15,7 +15,6 @@ platforms: driver_config: box: mvbcoding/awslinux - name: amazonlinux-2 - - name: centos-6 - name: centos-7 - name: centos-8 - name: debian-9 diff --git a/recipes/sasl_auth.rb b/recipes/sasl_auth.rb index 21ffa0b..bd9c18f 100644 --- a/recipes/sasl_auth.rb +++ b/recipes/sasl_auth.rb @@ -28,11 +28,7 @@ case node['platform_family'] when 'debian' sasl_pkgs = %w(libsasl2-2 libsasl2-modules ca-certificates) when 'rhel' - sasl_pkgs = if node['platform_version'].to_i < 6 - %w(cyrus-sasl cyrus-sasl-plain openssl) - else - %w(cyrus-sasl cyrus-sasl-plain ca-certificates) - end + sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates) when 'amazon' sasl_pkgs = %w(cyrus-sasl cyrus-sasl-plain ca-certificates) when 'fedora' diff --git a/spec/default_spec.rb b/spec/default_spec.rb index e067a53..b6f6d50 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -5,9 +5,9 @@ describe 'postfix::default' do stub_command('/usr/bin/test /etc/alternatives/mta -ef /usr/sbin/sendmail.postfix').and_return(true) end - context 'on Centos 6' do + context 'on Centos 8' do cached(:chef_run) do - ChefSpec::SoloRunner.new(platform: 'centos', version: '6').converge(described_recipe) + ChefSpec::SoloRunner.new(platform: 'centos', version: '8').converge(described_recipe) end it '[COOK-4423] renders file main.cf with /etc/pki/tls/cert.pem' do