Merge pull request #20196 from paolostivanin/p166325

Fix stig_remediation test
os-autoinst · Sep 16, 2024 · 83afc42 · 83afc42
2 parents 89c9971 + 2dbd887
commit 83afc42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/opensusebasetest.pm b/lib/opensusebasetest.pm
@@ -461,7 +461,7 @@ sub wait_grub {
     elsif (match_has_tag('encrypted-disk-password-prompt-grub') || match_has_tag('encrypted-disk-password-prompt')) {
         # unlock encrypted disk before grub
         unlock_bootloader;
-        assert_screen("grub2", timeout => ((is_pvm) ? 300 : 90));
+        assert_screen("grub2", timeout => ((is_pvm) ? 300 : 90)) unless check_var('STIG_REMEDIATION', '1');
     }
     mutex_wait 'support_server_ready' if get_var('USE_SUPPORT_SERVER');
 }

diff --git a/schedule/security/autoyast_stig_hardening.yaml b/schedule/security/autoyast_stig_hardening.yaml
@@ -12,8 +12,7 @@ schedule:
   - autoyast/installation
   - installation/grub_test
   - security/grub_auth/grub_authentication
-  - installation/boot_encrypt
-  - installation/first_boot
+  - security/boot_disk
   - security/stig/upload_stig_logs
   - security/stig/validate_stig_rules_applied_by_yast
 test_data: