Merge pull request #8123 from asdil12/sf2

Update upgrade tests SF2 -> firewalld
os-autoinst · Aug 6, 2019 · c4cf376 · c4cf376
2 parents 657a779 + 4984760
commit c4cf376
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/opensusebasetest.pm b/lib/opensusebasetest.pm
@@ -735,7 +735,7 @@ under test, the version and if the SUT is an upgrade.
 sub firewall {
     my $old_product_versions      = is_sle('<15') || is_leap('<15.0');
     my $upgrade_from_susefirewall = is_upgrade && get_var('HDD_1') =~ /\b(1[123]|42)[\.-]/;
-    return ($old_product_versions || $upgrade_from_susefirewall) ? 'SuSEfirewall2' : 'firewalld';
+    return (($old_product_versions || $upgrade_from_susefirewall) && !is_tumbleweed) ? 'SuSEfirewall2' : 'firewalld';
 }
 
 =head2 remount_tmp_if_ro