mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-09-28 08:47:22 +00:00
switch back to upstream proxy handling stuff
since it seems upstream is disinclined to take my TOTALLY BETTER way of doing the proxy kickstarts. philistines!
This commit is contained in:
parent
d4e21925a1
commit
6983d13e82
@ -10,6 +10,11 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
|
with warnings.catch_warnings():
|
||||||
|
warnings.simplefilter("ignore")
|
||||||
|
import pykickstart.version
|
||||||
|
import pykickstart.parser
|
||||||
|
|
||||||
SKIPS = [
|
SKIPS = [
|
||||||
# we haven't really figured out how to do NFS in openQA yet
|
# we haven't really figured out how to do NFS in openQA yet
|
||||||
'nfs-repo-and-addon',
|
'nfs-repo-and-addon',
|
||||||
@ -97,17 +102,25 @@ def prep_kickstarts(indir, ksurl, httprepo, nfsrepo, outdir, kstesturl=None, kst
|
|||||||
# probably safest
|
# probably safest
|
||||||
indir = os.path.abspath(indir)
|
indir = os.path.abspath(indir)
|
||||||
|
|
||||||
# build Makefile-driven .ks.ins
|
# build proxy-common.ks
|
||||||
ret = subprocess.call(('make', '-s'), cwd=indir)
|
# FIXME: we should do something more like run_kickstart_tests here
|
||||||
|
# but exclude install.img as it doesn't work
|
||||||
|
subprocess.check_call(('make', '-s', '-f', 'Makefile.prereqs', 'proxy-common.ks'),
|
||||||
|
cwd="{0}/{1}".format(indir, 'scripts'))
|
||||||
tests = _find_tests(indir)
|
tests = _find_tests(indir)
|
||||||
if not tests:
|
if not tests:
|
||||||
raise ValueError("No tests found!")
|
raise ValueError("No tests found!")
|
||||||
|
|
||||||
for test in tests:
|
for test in tests:
|
||||||
(sh, ksin) = _get_texts(indir, test)
|
(sh, ksin) = _get_texts(indir, test)
|
||||||
|
# HACK: this test can't handle https repo
|
||||||
|
if test == 'proxy-auth':
|
||||||
|
_kstesturl = kstesturl.replace('https://', 'http://')
|
||||||
|
else:
|
||||||
|
_kstesturl = kstesturl
|
||||||
# do standard substitutions
|
# do standard substitutions
|
||||||
ksin = _kickstart_substitutions(
|
ksin = _kickstart_substitutions(
|
||||||
ksin, ksurl, httprepo, nfsrepo, kstesturl=kstesturl, kstestftpurl=kstestftpurl)
|
ksin, ksurl, httprepo, nfsrepo, kstesturl=_kstesturl, kstestftpurl=kstestftpurl)
|
||||||
|
|
||||||
# replace '(non-alpha)sd(alpha)(non-alpha)' with '(non-alpha)
|
# replace '(non-alpha)sd(alpha)(non-alpha)' with '(non-alpha)
|
||||||
# vd(alpha)(non-alpha)' (sda -> vda etc). This is because
|
# vd(alpha)(non-alpha)' (sda -> vda etc). This is because
|
||||||
@ -117,6 +130,21 @@ def prep_kickstarts(indir, ksurl, httprepo, nfsrepo, outdir, kstesturl=None, kst
|
|||||||
# this.
|
# this.
|
||||||
ksin = re.sub(r'([^a-zA-Z])s(d[a-z][^a-zA-Z])', r"\1v\2", ksin)
|
ksin = re.sub(r'([^a-zA-Z])s(d[a-z][^a-zA-Z])', r"\1v\2", ksin)
|
||||||
|
|
||||||
|
# flatten the kickstart (some use includes). this code copies
|
||||||
|
# ksflatten quite closely.
|
||||||
|
if 'ksflatten' in sh:
|
||||||
|
# includes may be relative; we have to do this from indir
|
||||||
|
cwd = os.getcwd()
|
||||||
|
os.chdir(indir)
|
||||||
|
# good grief, pykickstart is chatty
|
||||||
|
with warnings.catch_warnings():
|
||||||
|
warnings.simplefilter("ignore")
|
||||||
|
handler = pykickstart.version.makeVersion()
|
||||||
|
parser = pykickstart.parser.KickstartParser(handler)
|
||||||
|
parser.readKickstartFromString(ksin)
|
||||||
|
ksin = str(parser.handler)
|
||||||
|
os.chdir(cwd)
|
||||||
|
|
||||||
# write out the processed .ks
|
# write out the processed .ks
|
||||||
ksout = "{0}.ks".format(test)
|
ksout = "{0}.ks".format(test)
|
||||||
with open('{0}/{1}'.format(outdir, ksout), 'w') as ksoutfh:
|
with open('{0}/{1}'.format(outdir, ksout), 'w') as ksoutfh:
|
||||||
|
Loading…
Reference in New Issue
Block a user