From 3614e5d3b0ec9a04e34c0e72fc1ae77a4c0c0d91 Mon Sep 17 00:00:00 2001 From: lionce <42546087+lionce@users.noreply.github.com> Date: Tue, 8 Oct 2019 17:33:40 +0300 Subject: [PATCH] FM-8400 - add debian10 support (#862) * FM-8356 Add support on debian 10 * fix tests for debian10 --- metadata.json | 3 ++- provision.yaml | 2 +- spec/acceptance/firewall_attributes_exceptions_spec.rb | 4 ++++ spec/acceptance/firewall_attributes_ipv6_exceptions_spec.rb | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/metadata.json b/metadata.json index 705a1d4..234812c 100644 --- a/metadata.json +++ b/metadata.json @@ -57,7 +57,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "8", - "9" + "9", + "10" ] }, { diff --git a/provision.yaml b/provision.yaml index ffdf1b8..c4a281e 100644 --- a/provision.yaml +++ b/provision.yaml @@ -10,4 +10,4 @@ waffle_el: images: ['waffleimage/centos7'] release_checks: provisioner: vmpooler - images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64'] + images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'oracle-6-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64'] diff --git a/spec/acceptance/firewall_attributes_exceptions_spec.rb b/spec/acceptance/firewall_attributes_exceptions_spec.rb index f810da2..c19e1f1 100644 --- a/spec/acceptance/firewall_attributes_exceptions_spec.rb +++ b/spec/acceptance/firewall_attributes_exceptions_spec.rb @@ -9,6 +9,10 @@ describe 'firewall basics', docker: true do end iptables_flush_all_tables ip6tables_flush_all_tables + if os[:family] == 'debian' && os[:release] == '10' + # in order to avoid this stderr: Warning: ip6tables-legacy tables present, use ip6tables-legacy-save to see them\n" + run_shell('update-alternatives --set iptables /usr/sbin/iptables-legacy') + end end # --bytecode is only supported by operatingsystems using nftables (in general Linux kernel 3.13, RedHat 7 (and derivates) with 3.10) diff --git a/spec/acceptance/firewall_attributes_ipv6_exceptions_spec.rb b/spec/acceptance/firewall_attributes_ipv6_exceptions_spec.rb index 6811cc8..263ce70 100644 --- a/spec/acceptance/firewall_attributes_ipv6_exceptions_spec.rb +++ b/spec/acceptance/firewall_attributes_ipv6_exceptions_spec.rb @@ -4,6 +4,10 @@ describe 'firewall ipv6 attribute testing, exceptions' do before(:all) do iptables_flush_all_tables ip6tables_flush_all_tables + if os[:family] == 'debian' && os[:release] == '10' + # in order to avoid this stderr: Warning: ip6tables-legacy tables present, use ip6tables-legacy-save to see them\n" + run_shell('update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy') + end end describe 'standard attributes', unless: (os[:family] == 'redhat' && os[:release].start_with?('5', '6')) || (os[:family] == 'sles') do -- 2.45.2