the rats_install has updated to run three times to test repo fedora, fedora+updates, fedora+updates+updates-testing. Please review the codes in branch rats_install and the diffs are as below:
diff --git a/lib/autoqa/virtguest.py b/lib/autoqa/virtguest.py index ba9af47..53ac16a 100644 --- a/lib/autoqa/virtguest.py +++ b/lib/autoqa/virtguest.py @@ -215,8 +215,7 @@ class VirtGuest(object): virt_args += ['--extra-args', '%s ks=%s' % (extra_args, kickstart)] elif kickstart.startswith(".") or kickstart.startswith("/"): virt_args += ['--initrd-inject=%s' % kickstart] - virt_args += ['--extra-args', '%s ks=file:/%s' % (extra_args, - os.path.basename(kickstart))] + virt_args += ['--extra-args', '%s ks=file:/ks.cfg' % extra_args]
if self.diskcount > 1: for n in range(1, self.diskcount): # e.g. 5 -> [1,2,3,4] diff --git a/tests/rats_install/control b/tests/rats_install/control index 2baffca..8e227d8 100644 --- a/tests/rats_install/control +++ b/tests/rats_install/control @@ -12,7 +12,4 @@ The test cases covered by this test are: """ MAINTAINER = "Hongqing Yang hoyang@redhat.com"
-# run test with different packages group -for pkg in ['fedora','updates','updates-testing']: - autoqa_args['pkg'] = pkg - job.run_test('rats_install', tag=pkg, **autoqa_args) +job.run_test('rats_install', **autoqa_args) diff --git a/tests/rats_install/fedora.cfg b/tests/rats_install/fedora.cfg deleted file mode 100644 index 238c7b3..0000000 --- a/tests/rats_install/fedora.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# Basic kickstart file for RATS -install -lang en_US.UTF-8 -keyboard us -network --device link --activate -rootpw --plaintext autoqa -timezone --utc America/New_York -# partitioning - nuke and start fresh -zerombr -clearpart --all --initlabel -autopart -bootloader --location=mbr -reboot -repo --name=fedora -# packages should be a superset of critpath -%packages -# @base should be selected by default -# critpath groups list taken from https://fedoraproject.org/wiki/Critical_path_package#Implementation -@core -@critical-path-base -@critical-path-gnome -@critical-path-apps -@critical-path-kde -@critical-path-lxde -@critical-path-xfce -%end diff --git a/tests/rats_install/install.py b/tests/rats_install/install.py index 7e040c0..429e8e7 100755 --- a/tests/rats_install/install.py +++ b/tests/rats_install/install.py @@ -81,7 +81,7 @@ def _get_parser(): return parser
-def parse_args(args=None, pkg=None): +def parse_args(args=None): parser = _get_parser() (opt, args) = parser.parse_args(args)
@@ -109,10 +109,8 @@ def parse_args(args=None, pkg=None): anaconda.logdir = opt.logdir
# if ksfile is not specifited, use the local default one - if pkg == 'updates': - opt.ksfile = os.path.join(opt.bindir,'updates.cfg') - elif pkg == 'updates-testing': - opt.ksfile = os.path.join(opt.bindir,'updates-testing.cfg') + if not opt.ksfile: + opt.ksfile = os.path.join(opt.bindir,'ks.cfg')
opt.keyval_file = os.path.join(opt.logdir, 'keyval')
@@ -180,10 +178,10 @@ def system_sanity():
#http://fedoraproject.org/wiki/QA:Rawhide_Acceptance_Test_Plan#Installability... -def main(args=None, pkg=None): +def main(args=None):
# Process command-line arguments - (opt, baseurl) = parse_args(args, pkg) + (opt, baseurl) = parse_args(args)
if not system_sanity(): return False diff --git a/tests/rats_install/ks.cfg b/tests/rats_install/ks.cfg new file mode 100644 index 0000000..e38e523 --- /dev/null +++ b/tests/rats_install/ks.cfg @@ -0,0 +1,26 @@ +# Basic kickstart file for RATS +install +lang en_US.UTF-8 +keyboard us +network --device link --activate +rootpw --plaintext autoqa +timezone --utc America/New_York +# partitioning - nuke and start fresh +zerombr +clearpart --all --initlabel +autopart +bootloader --location=mbr +reboot + +# packages should be a superset of critpath +%packages +# @base should be selected by default +# critpath groups list taken from https://fedoraproject.org/wiki/Critical_path_package#Implementation +@core +@critical-path-base +@critical-path-gnome +@critical-path-apps +@critical-path-kde +@critical-path-lxde +@critical-path-xfce +%end diff --git a/tests/rats_install/rats_install.py b/tests/rats_install/rats_install.py index 2a29f36..35c53c5 100644 --- a/tests/rats_install/rats_install.py +++ b/tests/rats_install/rats_install.py @@ -50,9 +50,9 @@ class rats_install(AutoQATest): self.detail.arch = arch # set self.detail.id if name: - self.detail.id = "%s-%s-%s" % (name, arch, kwargs['pkg']) + self.detail.id = "%s-%s" % (name, arch) else: - self.detail.id = kwargs['pkg']+':'+baseurl + self.detail.id = baseurl
@ExceptionCatcher() @@ -71,7 +71,7 @@ class rats_install(AutoQATest): sys.stdout = util.Tee(sys.stdout, out, autoclose=False) sys.stderr = util.Tee(sys.stderr, out, autoclose=False) # run the test - success = install.main(args,kwargs['pkg']) + success = install.main(args) # collect results if success: self.detail.result = 'PASSED' diff --git a/tests/rats_install/updates-testing.cfg b/tests/rats_install/updates-testing.cfg deleted file mode 100644 index 761474c..0000000 --- a/tests/rats_install/updates-testing.cfg +++ /dev/null @@ -1,28 +0,0 @@ -# Basic kickstart file for RATS -install -lang en_US.UTF-8 -keyboard us -network --device link --activate -rootpw --plaintext autoqa -timezone --utc America/New_York -# partitioning - nuke and start fresh -zerombr -clearpart --all --initlabel -autopart -bootloader --location=mbr -reboot -repo --name=fedora -repo --name=updates -repo --name=updates-testing -# packages should be a superset of critpath -%packages -# @base should be selected by default -# critpath groups list taken from https://fedoraproject.org/wiki/Critical_path_package#Implementation -@core -@critical-path-base -@critical-path-gnome -@critical-path-apps -@critical-path-kde -@critical-path-lxde -@critical-path-xfce -%end diff --git a/tests/rats_install/updates.cfg b/tests/rats_install/updates.cfg deleted file mode 100644 index 4df9dc7..0000000 --- a/tests/rats_install/updates.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# Basic kickstart file for RATS -install -lang en_US.UTF-8 -keyboard us -network --device link --activate -rootpw --plaintext autoqa -timezone --utc America/New_York -# partitioning - nuke and start fresh -zerombr -clearpart --all --initlabel -autopart -bootloader --location=mbr -reboot -repo --name=fedora -repo --name=updates -# packages should be a superset of critpath -%packages -# @base should be selected by default -# critpath groups list taken from https://fedoraproject.org/wiki/Critical_path_package#Implementation -@core -@critical-path-base -@critical-path-gnome -@critical-path-apps -@critical-path-kde -@critical-path-lxde -@critical-path-xfce -%end
autoqa-devel@lists.fedorahosted.org
-
Hongqing Yang