diff --git a/metadata.json b/metadata.json index 65ee44dcd..accbd4f8a 100644 --- a/metadata.json +++ b/metadata.json @@ -14,66 +14,10 @@ } ], "operatingsystem_support": [ - { - "operatingsystem": "RedHat", - "operatingsystemrelease": [ - "7", - "8", - "9" - ] - }, - { - "operatingsystem": "CentOS", - "operatingsystemrelease": [ - "7", - "8" - ] - }, - { - "operatingsystem": "OracleLinux", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "Debian", - "operatingsystemrelease": [ - "10", - "11", - "12" - ] - }, - { - "operatingsystem": "Scientific", - "operatingsystemrelease": [ - "7" - ] - }, - { - "operatingsystem": "SLES", - "operatingsystemrelease": [ - "12", - "15" - ] - }, { "operatingsystem": "Ubuntu", "operatingsystemrelease": [ - "18.04", - "20.04", - "22.04" - ] - }, - { - "operatingsystem": "Rocky", - "operatingsystemrelease": [ - "8" - ] - }, - { - "operatingsystem": "AlmaLinux", - "operatingsystemrelease": [ - "8" + "24.04" ] } ], diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb index cb41c5d98..c80f4ebfa 100644 --- a/spec/spec_helper_acceptance_local.rb +++ b/spec/spec_helper_acceptance_local.rb @@ -32,6 +32,10 @@ def ubuntu_2204? os[:family] == 'ubuntu' && os[:release].to_f == 22.04 end +def ubuntu_2404? + os[:family] == 'ubuntu' && os[:release].to_f == 24.04 +end + def sles_15? os[:family] == 'sles' && os[:release].to_i == 15 end @@ -41,7 +45,7 @@ def debian_12? end def charset - @charset ||= (debian_12? || ubuntu_2204? || sles_15?) ? 'utf8mb3' : 'utf8' + @charset ||= (ubuntu_2404? || debian_12? || ubuntu_2204? || sles_15?) ? 'utf8mb3' : 'utf8' end def get_db_cmd