Merge pull request #252 from jlausuch/json_asset

Use spdx.json extension as an ISO
os-autoinst · Jul 1, 2024 · 1dd18f0 · 1dd18f0
2 parents 2732a94 + b285438
commit 1dd18f0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/script/cfg.py b/script/cfg.py
@@ -71,6 +71,7 @@ def rsync_commands(checksum):
         ''' + rsync_fix_dest(distri, version, staging, use_staging_patterns) + '''
         asset_folder=other
         [[ ! $dest =~ \.iso$  ]] || asset_folder=iso
+        [[ ! $dest =~ \.spdx\.json$  ]] || asset_folder=iso
         [[ ! $dest =~ \.(qcow2|raw|vhd|vmdk|vhdx|xz)$ ]] || asset_folder=hdd
         ''' + rsync_commands(checksum) + '''
         repo0folder=${dest%.iso}
@@ -284,6 +285,8 @@ def openqa_call_start_ex(checksum):
    :
  elif [[ $destiso =~ \.iso$ ]]; then
    echo \" ''' + openqa_call_start_ex1(checksum, 'ISO')  + '''\"
+ elif [[ $destiso =~ \.spdx.json$ ]]; then
+   echo \" ''' + openqa_call_start_ex1(checksum, 'ISO')  + '''\"
  elif [[ $destiso =~ \.(hdd|qcow2|raw|raw\.xz|raw\.gz|vhdx\.xz|vmdk|vmdk\.xz)$ ]]; then
    echo \" ''' + openqa_call_start_ex1(checksum, 'HDD_1')  + '''\"
  elif [ -n "$destiso" ]; then