This removes KVM installation modes that are not used anymore and thus not worth maintaining.
Signed-off-by: Cleber Rosa <[email protected]> --- client/tests/kvm/build.cfg.sample | 21 --------------------- client/virt/kvm_installer.py | 35 +---------------------------------- client/virt/virt_utils.py | 23 ----------------------- 3 files changed, 1 insertions(+), 78 deletions(-) diff --git a/client/tests/kvm/build.cfg.sample b/client/tests/kvm/build.cfg.sample index f47b9e5..e60c4bc 100644 --- a/client/tests/kvm/build.cfg.sample +++ b/client/tests/kvm/build.cfg.sample @@ -17,27 +17,6 @@ variants: # Save the results of this build on test.resultsdir? save_results = no variants: - - release: - install_mode = release - ## Install from a kvm release. You can optionally specify - ## a release tag. If you omit it, the build test will get - ## the latest release tag available at that moment. - # release_tag = 84 - release_dir = http://downloads.sourceforge.net/project/kvm/ - release_listing = http://sourceforge.net/projects/kvm/files/ - # In some cases, you might want to provide a ROM dir, so ROM - # files can be copied from there to your source based install - # path_to_rom_images = /usr/share/kvm - - snapshot: - install_mode = snapshot - ## Install from a kvm snapshot location. You can optionally - ## specify a snapshot date. If you omit it, the test will get - ## yesterday's snapshot. - # snapshot_date = 20090712 - snapshot_dir = http://foo.org/kvm-snapshots/ - # In some cases, you might want to provide a ROM dir, so ROM - # files can be copied from there to your source based install - # path_to_rom_images = /usr/share/kvm - localtar: install_mode = localtar ## Install from tarball located on the host's filesystem. diff --git a/client/virt/kvm_installer.py b/client/virt/kvm_installer.py index 5a7ca5b..2dca976 100644 --- a/client/virt/kvm_installer.py +++ b/client/virt/kvm_installer.py @@ -464,35 +464,6 @@ class SourceDirInstaller(BaseInstaller): else: shutil.copytree(srcdir, self.srcdir) - if self.install_mode == 'release': - release_tag = params.get("release_tag") - release_dir = params.get("release_dir") - release_listing = params.get("release_listing") - logging.info("Installing KVM from release tarball") - if not release_tag: - release_tag = virt_utils.get_latest_kvm_release_tag( - release_listing) - tarball = os.path.join(release_dir, 'kvm', release_tag, - "kvm-%s.tar.gz" % release_tag) - logging.info("Retrieving release kvm-%s" % release_tag) - tarball = utils.unmap_url("/", tarball, "/tmp") - - elif self.install_mode == 'snapshot': - logging.info("Installing KVM from snapshot") - snapshot_dir = params.get("snapshot_dir") - if not snapshot_dir: - raise error.TestError("Snapshot dir not provided") - snapshot_date = params.get("snapshot_date") - if not snapshot_date: - # Take yesterday's snapshot - d = (datetime.date.today() - - datetime.timedelta(1)).strftime("%Y%m%d") - else: - d = snapshot_date - tarball = os.path.join(snapshot_dir, "kvm-snapshot-%s.tar.gz" % d) - logging.info("Retrieving kvm-snapshot-%s" % d) - tarball = utils.unmap_url("/", tarball, "/tmp") - elif self.install_mode == 'localtar': tarball = params.get("tarball") if not tarball: @@ -501,11 +472,9 @@ class SourceDirInstaller(BaseInstaller): logging.info("Installing KVM from a local tarball") logging.info("Using tarball %s") tarball = utils.unmap_url("/", params.get("tarball"), "/tmp") - - if self.install_mode in ['release', 'snapshot', 'localtar']: utils.extract_tarball_to_dir(tarball, self.srcdir) - if self.install_mode in ['release', 'snapshot', 'localtar', 'srcdir']: + if self.install_mode in ['localtar', 'srcdir']: self.repo_type = virt_utils.check_kvm_source_dir(self.srcdir) p = os.path.join(self.srcdir, 'configure') self.configure_options = virt_installer.check_configure_options(p) @@ -776,8 +745,6 @@ class FailedInstaller: installer_classes = { 'localsrc': SourceDirInstaller, 'localtar': SourceDirInstaller, - 'release': SourceDirInstaller, - 'snapshot': SourceDirInstaller, 'git': GitInstaller, 'yum': YumInstaller, 'koji': KojiInstaller, diff --git a/client/virt/virt_utils.py b/client/virt/virt_utils.py index f959825..6da9a49 100644 --- a/client/virt/virt_utils.py +++ b/client/virt/virt_utils.py @@ -466,29 +466,6 @@ def kill_process_tree(pid, sig=signal.SIGKILL): safe_kill(pid, signal.SIGCONT) -def get_latest_kvm_release_tag(release_listing): - """ - Fetches the latest release tag for KVM. - - @param release_listing: URL that contains a list of the Source Forge - KVM project files. - """ - try: - release_page = utils.urlopen(release_listing) - data = release_page.read() - release_page.close() - rx = re.compile("kvm-(\d+).tar.gz", re.IGNORECASE) - matches = rx.findall(data) - # In all regexp matches to something that looks like a release tag, - # get the largest integer. That will be our latest release tag. - latest_tag = max(int(x) for x in matches) - return str(latest_tag) - except Exception, e: - message = "Could not fetch latest KVM release tag: %s" % str(e) - logging.error(message) - raise error.TestError(message) - - def get_git_branch(repository, branch, srcdir, commit=None, lbranch=None): """ Retrieves a given git code repository. -- 1.7.4.4 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
