Merge pull request #19934 from hjluo/fix_supp_fips

Fix fips-certified for sles15sp4 support image
os-autoinst · Aug 13, 2024 · 86569fc · 86569fc
2 parents 1df4d5f + 3fcf199
commit 86569fc
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git a/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_aarch64.xml b/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_aarch64.xml
@@ -63,7 +63,6 @@ exit 0
       <pattern>enhanced_base</pattern>
       <pattern>enhanced_base-32bit</pattern>
       <pattern>file_server</pattern>
-      <pattern>fips</pattern>
       <pattern>fonts</pattern>
       <pattern>gateway_server</pattern>
       <pattern>kvm_server</pattern>

diff --git a/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_s390x.xml b/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_s390x.xml
@@ -85,7 +85,6 @@ exit 0
       <pattern>documentation</pattern>
       <pattern>enhanced_base</pattern>
       <pattern>file_server</pattern>
-      <pattern>fips</pattern>
       <pattern>fonts</pattern>
       <pattern>gateway_server</pattern>
       <pattern>hwcrypto</pattern>

diff --git a/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_x86_64.xml b/data/yam/autoyast/support_images/sles15sp4_install_gnome_all_patterns_x86_64.xml
@@ -63,7 +63,6 @@ exit 0
       <pattern>enhanced_base</pattern>
       <pattern>enhanced_base-32bit</pattern>
       <pattern>file_server</pattern>
-      <pattern>fips</pattern>
       <pattern>fonts</pattern>
       <pattern>gateway_server</pattern>
       <pattern>kvm_server</pattern>

diff --git a/lib/utils.pm b/lib/utils.pm
@@ -2487,6 +2487,8 @@ sub install_patterns {
         next if (($pt =~ /wsl_base|wsl_gui|wsl_systemd/) && check_var('PATTERNS', 'all'));
         # if pattern is common-criteria and PATTERNS is all, skip, poo#73645
         next if (($pt =~ /common-criteria/) && check_var('PATTERNS', 'all'));
+        # if pattern is fips or fips-certified and PATTERNS is all, skip
+        next if (($pt =~ /fips|fips-certified/) && check_var('PATTERNS', 'all'));
         zypper_call("in -t pattern $pt", timeout => 1800);
     }
 }