Fix cloud-init log collection (os-autoinst#20096)

Properly takes in account IPADDR_CLOUDINIT setting default when deciding if log collection is needed or not.
mpagot · Sep 2, 2024 · 24e2ebe · 24e2ebe
1 parent 06db8f2
commit 24e2ebe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tests/sles4sap/ipaddr2/configure.pm b/tests/sles4sap/ipaddr2/configure.pm
@@ -57,7 +57,7 @@ sub test_flags {
 sub post_fail_hook {
     my ($self) = shift;
     ipaddr2_deployment_logs() if check_var('IPADDR2_DIAGNOSTIC', 1);
-    ipaddr2_os_cloud_init_logs() if (check_var('IPADDR2_CLOUDINIT', 1));
+    ipaddr2_os_cloud_init_logs() unless check_var('IPADDR2_CLOUDINIT', 0);
     ipaddr2_destroy();
     $self->SUPER::post_fail_hook;
 }

diff --git a/tests/sles4sap/ipaddr2/deploy.pm b/tests/sles4sap/ipaddr2/deploy.pm
@@ -39,7 +39,7 @@ sub test_flags {
 sub post_fail_hook {
     my ($self) = shift;
     ipaddr2_deployment_logs() if check_var('IPADDR2_DIAGNOSTIC', 1);
-    ipaddr2_os_cloud_init_logs() if (check_var('IPADDR2_CLOUDINIT', 1));
+    ipaddr2_os_cloud_init_logs() unless check_var('IPADDR2_CLOUDINIT', 0);
     ipaddr2_destroy();
     $self->SUPER::post_fail_hook;
 }

diff --git a/tests/sles4sap/ipaddr2/sanity.pm b/tests/sles4sap/ipaddr2/sanity.pm
@@ -29,7 +29,7 @@ sub test_flags {
 sub post_fail_hook {
     my ($self) = shift;
     ipaddr2_deployment_logs() if check_var('IPADDR2_DIAGNOSTIC', 1);
-    ipaddr2_os_cloud_init_logs() if (check_var('IPADDR2_CLOUDINIT', 1));
+    ipaddr2_os_cloud_init_logs() unless check_var('IPADDR2_CLOUDINIT', 0);
     ipaddr2_destroy();
     $self->SUPER::post_fail_hook;
 }

diff --git a/tests/sles4sap/ipaddr2/test.pm b/tests/sles4sap/ipaddr2/test.pm
@@ -78,7 +78,7 @@ sub test_flags {
 sub post_fail_hook {
     my ($self) = shift;
     ipaddr2_deployment_logs() if check_var('IPADDR2_DIAGNOSTIC', 1);
-    ipaddr2_os_cloud_init_logs() if (check_var('IPADDR2_CLOUDINIT', 1));
+    ipaddr2_os_cloud_init_logs() unless check_var('IPADDR2_CLOUDINIT', 0);
     ipaddr2_destroy();
     $self->SUPER::post_fail_hook;
 }