JeOS: small fix for image_info

os-autoinst · May 20, 2022 · d30ea91 · d30ea91
1 parent 88dc186
commit d30ea91
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/tests/jeos/image_info.pm b/tests/jeos/image_info.pm
@@ -39,7 +39,7 @@ sub check_db {
     }
 
     # CASEDIR var is always set, and if when no specified, the value is "sle" for OSD and "opensuse" for O3
-    return if (get_required_var('CASEDIR') !~ m/^sle$|^opensuse$/);
+    return 0 if (get_required_var('CASEDIR') !~ m/^sle$|^opensuse$/);
 
     my $openqa_host = get_required_var('OPENQA_HOSTNAME');
     if ($openqa_host =~ /openqa1-opensuse|openqa.opensuse.org/) {    # O3 hostname
@@ -177,8 +177,9 @@ sub run {
     }
 
     # Get the size of different file types
-    unless (is_openstack) {
-        my $btrfs_summary = script_output('btrfs filesystem df --mbytes --si /');
+    # This step applies to BTRFS images. For simplicity, others images will be skipped.
+    my $btrfs_summary = script_output('btrfs filesystem df --mbytes --si /', proceed_on_failure => 1);
+    if ($btrfs_summary !~ /ERROR/) {
         record_info('btrfs', "$btrfs_summary");
         my ($data) = $btrfs_summary =~ /Data.*/g;
         my ($data_mb) = $data =~ /(\d+\.\d+)/g;