Skip to content

Commit c29b827

Browse files
alice-suseandrii-suse
authored andcommitted
Support extract_as_repo for SLM pxe tar file
1 parent 485d0f1 commit c29b827

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

script/cfg.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,11 @@ def rsync_commands(checksum):
7272
asset_folder=other
7373
[[ ! $dest =~ \.iso$ ]] || asset_folder=iso
7474
[[ ! $dest =~ \.spdx\.json$ ]] || asset_folder=iso
75+
[[ ! $dest =~ \.tar$ ]] || asset_folder=iso
7576
[[ ! $dest =~ \.(qcow2|raw|vhd|vmdk|vhdx|xz)$ ]] || asset_folder=hdd
7677
''' + rsync_commands(checksum) + '''
7778
repo0folder=${dest%.iso}
79+
repo0folder=${repo0folder%.tar}
7880
''' + (repo0folder if repo0folder else "") + '''
7981
[ -z "FLAVORASREPOORS" ] || [ $( echo "$flavor" | grep -E -c "^(FLAVORASREPOORS)$" ) -eq 0 ] || echo "[ -d /var/lib/openqa/factory/repo/$repo0folder ] || {
8082
mkdir /var/lib/openqa/factory/repo/$repo0folder
@@ -250,6 +252,7 @@ def pre_openqa_call_start(repos):
250252
[ -z "__STAGING" ] || build1=__STAGING.$build
251253
''' + openqa_call_fix_destiso(distri, version, staging) + '''
252254
repo0folder=${destiso%.iso}
255+
repo0folder=${repo0folder%.tar}
253256
''' + (repo0folder if repo0folder else "") + '''
254257
[ "$arch" != . ] || arch=x86_64
255258
''' + openqa_call_news(news, news_archs) + '''
@@ -290,6 +293,8 @@ def openqa_call_start_ex(checksum):
290293
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + '''\"
291294
elif [[ $destiso =~ \.spdx.json$ ]]; then
292295
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + '''\"
296+
elif [[ $destiso =~ \.tar$ ]]; then
297+
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + '''\"
293298
elif [[ $destiso =~ \.(hdd|qcow2|raw|raw\.xz|raw\.gz|vhdx\.xz|vmdk|vmdk\.xz)$ ]]; then
294299
echo \" ''' + openqa_call_start_ex1(checksum, 'HDD_1') + '''\"
295300
elif [ -n "$destiso" ]; then

script/scriptgen.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,8 @@ def gen_read_files(self, f):
562562
"",
563563
"Media1?.iso$",
564564
iso,
565+
"(Media1?|install.*).iso$",
566+
iso,
565567
)
566568
elif self.media1 != "0":
567569
self.p(cfg.read_files_iso, f, "FOLDER", self.iso_folder.get(iso, ""), "SRCISO", iso)

0 commit comments

Comments
 (0)