From 6f57f215ea7592c075fb83d1c58af991f930e193 Mon Sep 17 00:00:00 2001 From: Leo Manfredi Date: Thu, 18 Jan 2024 12:13:22 +0100 Subject: [PATCH] Add check for GM --- lib/y2_installbase.pm | 4 ++++ tests/installation/licensing/verify_license_translations.pm | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/y2_installbase.pm b/lib/y2_installbase.pm index 84724839f60c..aa5757f19fcb 100644 --- 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 index 2c98b478d7d7..cb740712eda5 100644 --- 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