From 36eae3b641249e499beb71b5ea202b7b6c2bcc66 Mon Sep 17 00:00:00 2001 From: nikhil1697 Date: Fri, 1 Mar 2024 00:06:04 +0530 Subject: [PATCH 1/4] update_func_check_packages_versions --- kubemarine/procedures/check_paas.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubemarine/procedures/check_paas.py b/kubemarine/procedures/check_paas.py index 0eb36da90..419fad5e9 100755 --- a/kubemarine/procedures/check_paas.py +++ b/kubemarine/procedures/check_paas.py @@ -239,8 +239,7 @@ def check_packages_versions(cluster: KubernetesCluster, tc: TestCase, hosts_to_p if version.startswith(package_name): good_results.append(version) else: - bad_results.append(version) - + bad_results.append(f"{package} (Actual version: {version}, Expected package: {package_name})") if bad_results: hint_message = f'Check the presence and correctness of the version of the following packages on the ' \ f'system: {bad_results}' From fe1d3bc591f636e171cd003637119decd5d8908f Mon Sep 17 00:00:00 2001 From: Nikhil A M <100134503+nikhil1697@users.noreply.github.com> Date: Fri, 1 Mar 2024 00:29:04 +0530 Subject: [PATCH 2/4] Update check_paas.py --- kubemarine/procedures/check_paas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubemarine/procedures/check_paas.py b/kubemarine/procedures/check_paas.py index 419fad5e9..b7237c3ea 100755 --- a/kubemarine/procedures/check_paas.py +++ b/kubemarine/procedures/check_paas.py @@ -239,7 +239,7 @@ def check_packages_versions(cluster: KubernetesCluster, tc: TestCase, hosts_to_p if version.startswith(package_name): good_results.append(version) else: - bad_results.append(f"{package} (Actual version: {version}, Expected package: {package_name})") + bad_results.append(f"{package} (Actual version: {version}, Expected package version: {package_name})") if bad_results: hint_message = f'Check the presence and correctness of the version of the following packages on the ' \ f'system: {bad_results}' From 764882a4d1732fd7e869a8920c6cede809ff8ac5 Mon Sep 17 00:00:00 2001 From: nikhil1697 Date: Thu, 7 Mar 2024 13:42:33 +0530 Subject: [PATCH 3/4] comment_fix --- kubemarine/procedures/check_paas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubemarine/procedures/check_paas.py b/kubemarine/procedures/check_paas.py index b7237c3ea..5bab70dcb 100755 --- a/kubemarine/procedures/check_paas.py +++ b/kubemarine/procedures/check_paas.py @@ -239,7 +239,7 @@ def check_packages_versions(cluster: KubernetesCluster, tc: TestCase, hosts_to_p if version.startswith(package_name): good_results.append(version) else: - bad_results.append(f"{package} (Actual version: {version}, Expected package version: {package_name})") + bad_results.append(f"{package} (Actual version: {version}, Expected package version: {package})") if bad_results: hint_message = f'Check the presence and correctness of the version of the following packages on the ' \ f'system: {bad_results}' From 4c6b9e5fb63997332ebdab198718d3195aaa76e3 Mon Sep 17 00:00:00 2001 From: nikhil1697 Date: Mon, 11 Mar 2024 12:20:22 +0530 Subject: [PATCH 4/4] rephrase_package --- kubemarine/procedures/check_paas.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kubemarine/procedures/check_paas.py b/kubemarine/procedures/check_paas.py index 5bab70dcb..4352fb330 100755 --- a/kubemarine/procedures/check_paas.py +++ b/kubemarine/procedures/check_paas.py @@ -239,10 +239,12 @@ def check_packages_versions(cluster: KubernetesCluster, tc: TestCase, hosts_to_p if version.startswith(package_name): good_results.append(version) else: - bad_results.append(f"{package} (Actual version: {version}, Expected package version: {package})") + bad_results.append(f"Actual version: {version} doesn't match expected package version: {package}") + + if bad_results: hint_message = f'Check the presence and correctness of the version of the following packages on the ' \ - f'system: {bad_results}' + f'system: {bad_results}\n' if warn_on_bad_result: raise TestWarn("detected incorrect packages versions", hint=hint_message) raise TestFailure("detected incorrect packages versions", hint=hint_message)