Skip to content

Commit 8ad5548

Browse files
authored
Merge pull request #836 from bastelfreak/arch
Disable server acceptance tests on Arch Linux
2 parents f4796f1 + 1cbad4e commit 8ad5548

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

spec/acceptance/server_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
require 'spec_helper_acceptance'
4-
describe 'zabbix::server class' do
4+
describe 'zabbix::server class', unless: default[:platform] =~ %r{archlinux} do
55
context 'default parameters' do
66
# Using puppet_apply as a helper
77
it 'works idempotently with no errors' do

spec/acceptance/zabbix_application_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_application type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
6+
describe 'zabbix_application type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# 5.2 and 5.4 server packages are not available for RHEL 7
99
next if zabbix_version == '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_host_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
7+
describe 'zabbix_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_hostgroup_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
6+
describe 'zabbix_hostgroup type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_proxy_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
require 'serverspec_type_zabbixapi'
55

66
# rubocop:disable RSpec/LetBeforeExamples
7-
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
7+
describe 'zabbix_proxy type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
88
supported_versions.each do |zabbix_version|
99
# >= 5.2 server packages are not available for RHEL 7
1010
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

spec/acceptance/zabbix_template_host_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
6+
describe 'zabbix_template_host type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# Zabbix 6.0 removed the ability to attach templates directly to hosts.
99
next if zabbix_version == '6.0'

spec/acceptance/zabbix_template_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require 'spec_helper_acceptance'
44
require 'serverspec_type_zabbixapi'
55

6-
describe 'zabbix_template type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9)-amd64} do
6+
describe 'zabbix_template type', unless: default[:platform] =~ %r{(ubuntu-16.04|debian-9|archlinux)} do
77
supported_versions.each do |zabbix_version|
88
# >= 5.2 server packages are not available for RHEL 7
99
next if zabbix_version >= '5.2' && default[:platform] == 'el-7-x86_64'

0 commit comments

Comments
 (0)