Skip to content

Commit 34f3bf6

Browse files
test: new path for database schema
1 parent 232404c commit 34f3bf6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

spec/classes/database_mysql_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@
2727

2828
supported_versions.each do |zabbix_version|
2929
# path to sql files on Debian and RedHat
30-
path = if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
30+
path = if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
31+
'/usr/share/zabbix-sql-scripts/mysql/'
32+
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
3133
'/usr/share/doc/zabbix-sql-scripts/mysql/'
3234
else
3335
'/usr/share/doc/zabbix-*-mysql*'

spec/classes/database_postgresql_spec.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,18 @@
2323
path = case facts[:os]['name']
2424
when 'CentOS', 'RedHat', 'OracleLinux', 'VirtuozzoLinux'
2525
# Path on RedHat
26-
if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
26+
if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
27+
'/usr/share/zabbix-sql-scripts/postgresql/'
28+
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
2729
'/usr/share/doc/zabbix-sql-scripts/postgresql/'
2830
else
2931
"/usr/share/doc/zabbix-*-pgsql-#{zabbix_version}*/"
3032
end
3133
else
3234
# Path on Debian
33-
if Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
35+
if Puppet::Util::Package.versioncmp(zabbix_version, '6.0') >= 0
36+
'/usr/share/zabbix-sql-scripts/postgresql/'
37+
elsif Puppet::Util::Package.versioncmp(zabbix_version, '5.4') >= 0
3438
'/usr/share/doc/zabbix-sql-scripts/postgresql/'
3539
else
3640
'/usr/share/doc/zabbix-*-pgsql'

0 commit comments

Comments
 (0)