Merge pull request os-autoinst#18484 from manfredi/issues-151837

Revisit soft-failure bsc#1203004 for GMC
sofiasyria · Jan 19, 2024 · 24c79ce · 24c79ce
2 parents d37545b + 6f57f21
commit 24c79ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/y2_installbase.pm b/lib/y2_installbase.pm
@@ -611,6 +611,10 @@ sub deal_with_dependency_issues {
     }
 }
 
+sub is_sles_in_gm_phase {
+    return !get_var('BETA');
+}
+
 sub save_remote_upload_y2logs {
     my ($self, %args) = @_;
 

diff --git a/tests/installation/licensing/verify_license_translations.pm b/tests/installation/licensing/verify_license_translations.pm
@@ -54,8 +54,9 @@ sub run {
         $license_agreement->select_language($found_lang);
         $license_agreement_info = $license_agreement->collect_current_license_agreement_info();
         if ($license_agreement_info->{text} !~ /$translation->{text}/) {
-            record_soft_failure("EULA content for the language: '$translation->{language}' didn't validate. See bsc#1203004 for details.\n");
-            diag("EULA validation failed:\nExpected:\n$translation->{text}\nActual:\n$license_agreement_info->{text}\n\n");
+            my $eula_err = "EULA content for the language: '$translation->{language}' didn't validate.";
+            die($eula_err) if $self->is_sles_in_gm_phase();
+            record_info('EULA', "EULAs usually not ready before GMC: $eula_err");
         }
     }
     # Set language back to default