network - no initscripts on el9, restore resolv.conf - storage deadcode issue

fix network .diff files for new code

network - tests_provider_nm.yml fails with an error: Failure in test 'I can manage a veth interface with NM after I managed it with initscripts.
Resolves: rhbz#1935919

network - _initscripts tests fail because "No package network-scripts available."
Resolves: rhbz#1935916

network - Test tests_bond_initscripts.yml failed to create interface
Resolves: rhbz#1980870

storage - covscan error - DEADCODE - vdopool if create_vdo else parent
Resolves: rhbz#1985571 (EL9)

network - network: tests_bond_initscripts.yml leaves behind unusable resolv.conf in CI

(cherry picked from commit de826808619f4888b822ec834d0f04e445bd743c)
This commit is contained in:
Rich Megginson 2021-07-29 17:56:38 -06:00
parent 6fa0f73cd0
commit 00294d4775

View File

@ -14,7 +14,7 @@ diff --git a/tests/playbooks/tests_bond.yml b/tests/playbooks/tests_bond.yml
index 1e45788..d3005a6 100644 index 1e45788..d3005a6 100644
--- a/tests/playbooks/tests_bond.yml --- a/tests/playbooks/tests_bond.yml
+++ b/tests/playbooks/tests_bond.yml +++ b/tests/playbooks/tests_bond.yml
@@ -13,6 +13,8 @@ @@ -8,6 +8,8 @@
dhcp_interface1: test1 dhcp_interface1: test1
port2_profile: bond0.1 port2_profile: bond0.1
dhcp_interface2: test2 dhcp_interface2: test2
@ -40,24 +40,26 @@ diff --git a/tests/tests_bond_deprecated_initscripts.yml b/tests/tests_bond_depr
index 383b488..cdf3de0 100644 index 383b488..cdf3de0 100644
--- a/tests/tests_bond_deprecated_initscripts.yml --- a/tests/tests_bond_deprecated_initscripts.yml
+++ b/tests/tests_bond_deprecated_initscripts.yml +++ b/tests/tests_bond_deprecated_initscripts.yml
@@ -9,5 +9,6 @@ @@ -10,6 +10,7 @@
network_provider: initscripts network_provider: initscripts
tags: tags:
- always - always
+ - "tests::expfail" + - "tests::expfail"
- import_playbook: playbooks/tests_bond_deprecated.yml - import_playbook: playbooks/tests_bond_deprecated.yml
when: (ansible_distribution in ['CentOS','RedHat'] and
diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml
index 8fa74c5..6a231c4 100644 index 8fa74c5..6a231c4 100644
--- a/tests/tests_bond_initscripts.yml --- a/tests/tests_bond_initscripts.yml
+++ b/tests/tests_bond_initscripts.yml +++ b/tests/tests_bond_initscripts.yml
@@ -9,5 +9,6 @@ @@ -10,6 +10,7 @@
network_provider: initscripts network_provider: initscripts
tags: tags:
- always - always
+ - "tests::expfail" + - "tests::expfail"
- import_playbook: playbooks/tests_bond.yml - import_playbook: playbooks/tests_bond.yml
when: (ansible_distribution in ['CentOS','RedHat'] and
-- --
2.30.2 2.30.2