diff --git a/script/cfg.py b/script/cfg.py index 79e9a74..247e0a3 100644 --- a/script/cfg.py +++ b/script/cfg.py @@ -72,9 +72,11 @@ def rsync_commands(checksum): asset_folder=other [[ ! $dest =~ \.iso$ ]] || asset_folder=iso [[ ! $dest =~ \.spdx\.json$ ]] || asset_folder=iso + [[ ! $dest =~ \.tar$ ]] || asset_folder=iso [[ ! $dest =~ \.(qcow2|raw|vhd|vmdk|vhdx|xz)$ ]] || asset_folder=hdd ''' + rsync_commands(checksum) + ''' repo0folder=${dest%.iso} + repo0folder=${repo0folder%.tar} ''' + (repo0folder if repo0folder else "") + ''' [ -z "FLAVORASREPOORS" ] || [ $( echo "$flavor" | grep -E -c "^(FLAVORASREPOORS)$" ) -eq 0 ] || echo "[ -d /var/lib/openqa/factory/repo/$repo0folder ] || { mkdir /var/lib/openqa/factory/repo/$repo0folder @@ -250,6 +252,7 @@ def pre_openqa_call_start(repos): [ -z "__STAGING" ] || build1=__STAGING.$build ''' + openqa_call_fix_destiso(distri, version, staging) + ''' repo0folder=${destiso%.iso} + repo0folder=${repo0folder%.tar} ''' + (repo0folder if repo0folder else "") + ''' [ "$arch" != . ] || arch=x86_64 ''' + openqa_call_news(news, news_archs) + ''' @@ -290,6 +293,8 @@ def openqa_call_start_ex(checksum): echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + '''\" elif [[ $destiso =~ \.spdx.json$ ]]; then echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + '''\" + elif [[ $destiso =~ \.tar$ ]]; 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 diff --git a/script/scriptgen.py b/script/scriptgen.py index 7c6020e..d7f58ae 100644 --- a/script/scriptgen.py +++ b/script/scriptgen.py @@ -562,6 +562,8 @@ def gen_read_files(self, f): "", "Media1?.iso$", iso, + "(Media1?|install.*).iso$", + iso, ) elif self.media1 != "0": self.p(cfg.read_files_iso, f, "FOLDER", self.iso_folder.get(iso, ""), "SRCISO", iso)