diff --git a/metadata.json b/metadata.json index aa4b200f..238961c4 100644 --- a/metadata.json +++ b/metadata.json @@ -64,7 +64,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "8", - "9" + "9", + "10" ] }, { diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 78def8bd..8ad977f3 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -1,7 +1,8 @@ require 'spec_helper_acceptance' describe 'proxysql class' do - unless fact('os.release.major') == '18.04' # There are no proxysql 1.4 packages for bionic + unless fact('os.release.major') == '18.04' || + (fact('os.name') == 'Debian' && fact('os.release.major') == '10') # There are no proxysql 1.4 packages for these OSes context 'version 1.4' do it 'works idempotently with no errors' do pp = <<-EOS diff --git a/spec/classes/proxysql_spec.rb b/spec/classes/proxysql_spec.rb index c403d857..6086d76e 100644 --- a/spec/classes/proxysql_spec.rb +++ b/spec/classes/proxysql_spec.rb @@ -80,7 +80,7 @@ unless (facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '7') || (facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemmajrelease] == '18.04') || - (facts[:operatingsystem] == 'Debian' && facts[:operatingsystemmajrelease] == '9') + (facts[:operatingsystem] == 'Debian' && facts[:operatingsystemmajrelease] =~ %r{^(9|10)$}) it { is_expected.to contain_service('proxysql').with_hasstatus(true) } it { is_expected.to contain_service('proxysql').with_hasrestart(true) } end