Merge pull request os-autoinst#21688 from asmorodskyi/upload_logs2

Disable cleanup for upload_img tests

Author: asmorodskyi

lib/publiccloud/azure.pm

@@ -634,6 +634,7 @@ sub cleanup {
     $self->get_image_version() if (get_var('PUBLIC_CLOUD_BUILD'));
     $self->upload_boot_diagnostics();
     $self->SUPER::cleanup();
+    return 1;
 }
 
 sub query_metadata {

lib/publiccloud/ec2.pm

@@ -205,6 +205,7 @@ sub cleanup {
     $self->upload_boot_diagnostics();
     $self->terraform_destroy() if ($self->terraform_applied);
     $self->delete_keypair();
+    return 1;
 }
 
 sub describe_instance {

lib/publiccloud/gce.pm

@@ -199,6 +199,7 @@ sub cleanup {
     my ($self, $args) = @_;
     $self->upload_boot_diagnostics();
     $self->SUPER::cleanup();
+    return 1;
 }
 
 sub query_metadata {

lib/publiccloud/noprovider.pm

@@ -58,6 +58,7 @@ sub create_ssh_key {
 sub cleanup {
     my ($self) = @_;
     # Do nothing with existing instance.
+    return 1;
 }
 
 1;

lib/publiccloud/openstack.pm

@@ -101,6 +101,7 @@ sub cleanup {
     $self->terraform_destroy() if ($self->terraform_applied);
     $self->delete_keypair();
     $self->delete_floating_ip();
+    return 1;
 }
 
 1;

lib/publiccloud/openstack_client.pm

@@ -92,6 +92,7 @@ sub init {
 
 sub cleanup {
     my ($self) = @_;
+    return 1;
 }
 
 1;

tests/publiccloud/aws_cli.pm

@@ -79,11 +79,11 @@ sub cleanup {
     assert_script_run "aws ec2 delete-key-pair --key-name $ssh_key";
     # The security group can be deleted only after the instance is terminated which takes a moment
     script_retry "aws ec2 delete-security-group --group-name $security_group_name", delay => 15, retry => 12;
+    return 1;
 }
 
 sub test_flags {
     return {fatal => 0, milestone => 0, always_rollback => 1};
 }
 
 1;
-

tests/publiccloud/azure_cli.pm

@@ -71,6 +71,7 @@ sub cleanup {
     my $machine_name = "openqa-cli-test-vm-$job_id";
 
     assert_script_run("az group delete --resource-group $resource_group --yes", 180);
+    return 1;
 }
 
 sub test_flags {

tests/publiccloud/img_proof.pm

@@ -184,6 +184,7 @@ sub cleanup {
         assert_script_run('tar -zcvf img_proof_results.tar.gz img_proof_results');
         upload_logs('img_proof_results.tar.gz', failok => 1);
     }
+    return 1;
 }
 
 1;
@@ -198,4 +199,3 @@ public cloud module.
 
 The variables DISTRI, VERSION and ARCH must correspond to the system where
 img-proof get installed in and not to the public cloud image.
-

tests/publiccloud/run_ltp.pm

@@ -200,6 +200,7 @@ sub cleanup {
         script_run("(cd /tmp/log_instance && tar -zcf $root_dir/instance_log.tar.gz *)");
         upload_logs("$root_dir/instance_log.tar.gz", failok => 1);
     }
+    return 1;
 }
 
 sub gen_ltp_env {