Skip to content

Commit 5bf4e7d

Browse files
committed
Add handling for MIRROR_* variables
1 parent a314147 commit 5bf4e7d

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

script/cfg.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,14 @@ def openqa_call_repo0():
363363
FULLURL=1 \\\\"
364364
}'''
365365

366+
def openqa_call_repo_unconditional():
367+
return ''' echo " MIRROR_PREFIX=http://openqa.opensuse.org/assets/repo \\\\
368+
SUSEMIRROR=http://openqa.opensuse.org/assets/repo/REPO0_ISO \\\\
369+
MIRROR_HTTP=http://openqa.opensuse.org/assets/repo/REPO0_ISO \\\\
370+
MIRROR_HTTPS=https://openqa.opensuse.org/assets/repo/REPO0_ISO \\\\
371+
FULLURL=1 \\\\"
372+
'''
373+
366374
openqa_call_repo0a = ' [ -z "FLAVORASREPOORS" ] || [ $( echo "$flavor" | grep -E -c "^(FLAVORASREPOORS)$" ) -eq 0 ] || '
367375

368376
openqa_call_repo0b = ' echo " REPO_0=REPO0_ISO \\\\"'

script/scriptgen.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,8 @@ def gen_print_openqa(self, f):
10411041
" echo \" REPO_{}_SOURCE_PACKAGES='{}'\" \\\\".format(repo.tag.upper(), repo.get("source", "")), f
10421042
)
10431043
imultiarch = imultiarch + 1
1044+
if imultiarch > 0:
1045+
self.p(cfg.openqa_call_repo_unconditional(), f, "REPO0_ISO", '{}-$buildex'.format(dest))
10441046

10451047
if len(self.iso1) > 0:
10461048
self.p(' iso1=""', f)

0 commit comments

Comments
 (0)