[PATCH] Remove the kickstart_tests directory.

Chris Lumens clumens at redhat.com
Fri Nov 13 19:58:28 UTC 2015


This is now in its own git repo, for ease of sharing with other
projects.
---
 docs/kickstart-tests.rst                           |   3 -
 tests/Makefile.am                                  |   6 +-
 tests/README.rst                                   |   3 -
 tests/kickstart_tests/README.rst                   |  73 -----
 tests/kickstart_tests/basic-ftp.ks.in              |  22 --
 tests/kickstart_tests/basic-ftp.sh                 |  23 --
 tests/kickstart_tests/basic-ostree.ks.in           |  20 --
 tests/kickstart_tests/basic-ostree.sh              |  23 --
 tests/kickstart_tests/bond.ks.in                   |  56 ----
 tests/kickstart_tests/bond.sh                      |  22 --
 tests/kickstart_tests/btrfs-1.ks.in                |  48 ----
 tests/kickstart_tests/btrfs-1.sh                   |  46 ---
 tests/kickstart_tests/btrfs-2.ks.in                |  59 ----
 tests/kickstart_tests/btrfs-2.sh                   |  46 ---
 tests/kickstart_tests/container.ks.in              |  56 ----
 tests/kickstart_tests/container.sh                 |  22 --
 tests/kickstart_tests/default-fstype.ks.in         |  38 ---
 tests/kickstart_tests/default-fstype.sh            |  22 --
 tests/kickstart_tests/driverdisk-disk.ks.in        |  41 ---
 tests/kickstart_tests/driverdisk-disk.sh           |  35 ---
 tests/kickstart_tests/encrypt-device.ks.in         |  32 ---
 tests/kickstart_tests/encrypt-device.sh            |  45 ---
 tests/kickstart_tests/escrow-cert.ks.in            | 108 -------
 tests/kickstart_tests/escrow-cert.sh               |  46 ---
 tests/kickstart_tests/firewall.ks.in               |  59 ----
 tests/kickstart_tests/firewall.sh                  |  22 --
 tests/kickstart_tests/functions.sh                 |  90 ------
 tests/kickstart_tests/groups-and-envs-1.ks.in      |  36 ---
 tests/kickstart_tests/groups-and-envs-1.sh         |  22 --
 tests/kickstart_tests/groups-and-envs-2.ks.in      |  80 ------
 tests/kickstart_tests/groups-and-envs-2.sh         |  22 --
 tests/kickstart_tests/groups-and-envs-3.ks.in      |  34 ---
 tests/kickstart_tests/groups-and-envs-3.sh         |  22 --
 tests/kickstart_tests/hostname.ks.in               |  38 ---
 tests/kickstart_tests/hostname.sh                  |  45 ---
 tests/kickstart_tests/ignoredisk.ks.in             |  51 ----
 tests/kickstart_tests/ignoredisk.sh                |  30 --
 tests/kickstart_tests/keyboard-addtnl.ks.in        |  42 ---
 tests/kickstart_tests/keyboard-addtnl.sh           |  22 --
 tests/kickstart_tests/keyboard.ks.in               |  33 ---
 tests/kickstart_tests/keyboard.sh                  |  22 --
 tests/kickstart_tests/ks-include-post.ks           |   4 -
 tests/kickstart_tests/ks-include.ks.in             |  20 --
 tests/kickstart_tests/ks-include.sh                |  46 ---
 tests/kickstart_tests/lang-2.ks.in                 |  43 ---
 tests/kickstart_tests/lang-2.sh                    |  22 --
 tests/kickstart_tests/lang.ks.in                   |  33 ---
 tests/kickstart_tests/lang.sh                      |  22 --
 tests/kickstart_tests/liveimg.ks.in                |  28 --
 tests/kickstart_tests/liveimg.sh                   |  55 ----
 tests/kickstart_tests/lvm-1.ks.in                  |  77 -----
 tests/kickstart_tests/lvm-1.sh                     |  22 --
 tests/kickstart_tests/lvm-2.ks.in                  |  44 ---
 tests/kickstart_tests/lvm-2.sh                     |  22 --
 tests/kickstart_tests/lvm-cache-1.ks.in            | 173 ------------
 tests/kickstart_tests/lvm-cache-1.sh               |  31 ---
 tests/kickstart_tests/lvm-cache-2.ks.in            | 175 ------------
 tests/kickstart_tests/lvm-cache-2.sh               |  31 ---
 tests/kickstart_tests/lvm-raid-1.ks.in             |  86 ------
 tests/kickstart_tests/lvm-raid-1.sh                |  35 ---
 tests/kickstart_tests/lvm-thinp-1.ks.in            | 106 -------
 tests/kickstart_tests/lvm-thinp-1.sh               |  22 --
 tests/kickstart_tests/lvm-thinp-2.ks.in            | 114 --------
 tests/kickstart_tests/lvm-thinp-2.sh               |  22 --
 tests/kickstart_tests/nfs-repo-and-addon.ks.in     | 106 -------
 tests/kickstart_tests/nfs-repo-and-addon.sh        |  46 ---
 tests/kickstart_tests/ntp-pools.ks.in              |  38 ---
 tests/kickstart_tests/ntp-pools.sh                 |  22 --
 tests/kickstart_tests/packages-and-groups-1.ks.in  |  73 -----
 tests/kickstart_tests/packages-and-groups-1.sh     |  22 --
 tests/kickstart_tests/packages-default.ks.in       |  27 --
 tests/kickstart_tests/packages-default.sh          |  22 --
 tests/kickstart_tests/packages-excludedocs.ks.in   |  48 ----
 tests/kickstart_tests/packages-excludedocs.sh      |  22 --
 tests/kickstart_tests/packages-ignoremissing.ks.in |  24 --
 tests/kickstart_tests/packages-ignoremissing.sh    |  22 --
 tests/kickstart_tests/packages-instlangs-1.ks.in   |  45 ---
 tests/kickstart_tests/packages-instlangs-1.sh      |  22 --
 tests/kickstart_tests/packages-instlangs-2.ks.in   |  37 ---
 tests/kickstart_tests/packages-instlangs-2.sh      |  22 --
 tests/kickstart_tests/packages-instlangs-3.ks.in   |  73 -----
 tests/kickstart_tests/packages-instlangs-3.sh      |  22 --
 tests/kickstart_tests/packages-multilib.ks.in      |  34 ---
 tests/kickstart_tests/packages-multilib.sh         |  22 --
 tests/kickstart_tests/pre-install.ks.in            |  64 -----
 tests/kickstart_tests/pre-install.sh               |  22 --
 tests/kickstart_tests/proxy-auth.ks.in             |  87 ------
 tests/kickstart_tests/proxy-auth.sh                |  53 ----
 tests/kickstart_tests/proxy-cmdline.ks.in          |  41 ---
 tests/kickstart_tests/proxy-cmdline.sh             |  39 ---
 tests/kickstart_tests/proxy-kickstart.ks.in        |  82 ------
 tests/kickstart_tests/proxy-kickstart.sh           |  53 ----
 tests/kickstart_tests/raid-1.ks.in                 | 108 -------
 tests/kickstart_tests/raid-1.sh                    |  53 ----
 tests/kickstart_tests/reqpart.ks.in                |  41 ---
 tests/kickstart_tests/reqpart.sh                   |  22 --
 tests/kickstart_tests/rootpw.ks.in                 |  50 ----
 tests/kickstart_tests/rootpw.sh                    |  22 --
 tests/kickstart_tests/scripts/Makefile.prereqs     |  28 --
 tests/kickstart_tests/scripts/defaults.sh          |   6 -
 tests/kickstart_tests/scripts/find-ip              |  26 --
 tests/kickstart_tests/scripts/httpd.py             |  56 ----
 tests/kickstart_tests/scripts/kstest-runner        | 309 ---------------------
 tests/kickstart_tests/scripts/make-addon-pkgs.py   | 132 ---------
 tests/kickstart_tests/scripts/proxy.py             | 122 --------
 .../kickstart_tests/scripts/run_kickstart_tests.sh | 244 ----------------
 tests/kickstart_tests/scripts/run_one_ks.sh        | 179 ------------
 tests/kickstart_tests/scripts/run_report.sh        |  26 --
 tests/kickstart_tests/selinux-disabled.ks.in       |  35 ---
 tests/kickstart_tests/selinux-disabled.sh          |  22 --
 tests/kickstart_tests/selinux-enforcing.ks.in      |  35 ---
 tests/kickstart_tests/selinux-enforcing.sh         |  22 --
 tests/kickstart_tests/selinux-permissive.ks.in     |  35 ---
 tests/kickstart_tests/selinux-permissive.sh        |  22 --
 tests/kickstart_tests/services.ks.in               |  56 ----
 tests/kickstart_tests/services.sh                  |  22 --
 tests/kickstart_tests/timezoneLOCAL.ks.in          |  39 ---
 tests/kickstart_tests/timezoneLOCAL.sh             |  22 --
 tests/kickstart_tests/timezoneUTC.ks.in            |  39 ---
 tests/kickstart_tests/timezoneUTC.sh               |  22 --
 tests/kickstart_tests/tmpfs-fixed_size.ks.in       |  49 ----
 tests/kickstart_tests/tmpfs-fixed_size.sh          |  45 ---
 tests/kickstart_tests/user.ks.in                   | 117 --------
 tests/kickstart_tests/user.sh                      |  22 --
 tests/kickstart_tests/vlan.ks.in                   |  57 ----
 tests/kickstart_tests/vlan.sh                      |  22 --
 126 files changed, 1 insertion(+), 6094 deletions(-)
 delete mode 100644 docs/kickstart-tests.rst
 delete mode 100644 tests/kickstart_tests/README.rst
 delete mode 100644 tests/kickstart_tests/basic-ftp.ks.in
 delete mode 100755 tests/kickstart_tests/basic-ftp.sh
 delete mode 100644 tests/kickstart_tests/basic-ostree.ks.in
 delete mode 100755 tests/kickstart_tests/basic-ostree.sh
 delete mode 100644 tests/kickstart_tests/bond.ks.in
 delete mode 100755 tests/kickstart_tests/bond.sh
 delete mode 100644 tests/kickstart_tests/btrfs-1.ks.in
 delete mode 100755 tests/kickstart_tests/btrfs-1.sh
 delete mode 100644 tests/kickstart_tests/btrfs-2.ks.in
 delete mode 100755 tests/kickstart_tests/btrfs-2.sh
 delete mode 100644 tests/kickstart_tests/container.ks.in
 delete mode 100755 tests/kickstart_tests/container.sh
 delete mode 100644 tests/kickstart_tests/default-fstype.ks.in
 delete mode 100755 tests/kickstart_tests/default-fstype.sh
 delete mode 100644 tests/kickstart_tests/driverdisk-disk.ks.in
 delete mode 100755 tests/kickstart_tests/driverdisk-disk.sh
 delete mode 100644 tests/kickstart_tests/encrypt-device.ks.in
 delete mode 100755 tests/kickstart_tests/encrypt-device.sh
 delete mode 100644 tests/kickstart_tests/escrow-cert.ks.in
 delete mode 100755 tests/kickstart_tests/escrow-cert.sh
 delete mode 100644 tests/kickstart_tests/firewall.ks.in
 delete mode 100755 tests/kickstart_tests/firewall.sh
 delete mode 100644 tests/kickstart_tests/functions.sh
 delete mode 100644 tests/kickstart_tests/groups-and-envs-1.ks.in
 delete mode 100755 tests/kickstart_tests/groups-and-envs-1.sh
 delete mode 100644 tests/kickstart_tests/groups-and-envs-2.ks.in
 delete mode 100755 tests/kickstart_tests/groups-and-envs-2.sh
 delete mode 100644 tests/kickstart_tests/groups-and-envs-3.ks.in
 delete mode 100755 tests/kickstart_tests/groups-and-envs-3.sh
 delete mode 100644 tests/kickstart_tests/hostname.ks.in
 delete mode 100755 tests/kickstart_tests/hostname.sh
 delete mode 100644 tests/kickstart_tests/ignoredisk.ks.in
 delete mode 100755 tests/kickstart_tests/ignoredisk.sh
 delete mode 100644 tests/kickstart_tests/keyboard-addtnl.ks.in
 delete mode 100755 tests/kickstart_tests/keyboard-addtnl.sh
 delete mode 100644 tests/kickstart_tests/keyboard.ks.in
 delete mode 100755 tests/kickstart_tests/keyboard.sh
 delete mode 100644 tests/kickstart_tests/ks-include-post.ks
 delete mode 100644 tests/kickstart_tests/ks-include.ks.in
 delete mode 100755 tests/kickstart_tests/ks-include.sh
 delete mode 100644 tests/kickstart_tests/lang-2.ks.in
 delete mode 100755 tests/kickstart_tests/lang-2.sh
 delete mode 100644 tests/kickstart_tests/lang.ks.in
 delete mode 100755 tests/kickstart_tests/lang.sh
 delete mode 100644 tests/kickstart_tests/liveimg.ks.in
 delete mode 100755 tests/kickstart_tests/liveimg.sh
 delete mode 100644 tests/kickstart_tests/lvm-1.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-1.sh
 delete mode 100644 tests/kickstart_tests/lvm-2.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-2.sh
 delete mode 100644 tests/kickstart_tests/lvm-cache-1.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-cache-1.sh
 delete mode 100644 tests/kickstart_tests/lvm-cache-2.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-cache-2.sh
 delete mode 100644 tests/kickstart_tests/lvm-raid-1.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-raid-1.sh
 delete mode 100644 tests/kickstart_tests/lvm-thinp-1.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-thinp-1.sh
 delete mode 100644 tests/kickstart_tests/lvm-thinp-2.ks.in
 delete mode 100755 tests/kickstart_tests/lvm-thinp-2.sh
 delete mode 100644 tests/kickstart_tests/nfs-repo-and-addon.ks.in
 delete mode 100755 tests/kickstart_tests/nfs-repo-and-addon.sh
 delete mode 100644 tests/kickstart_tests/ntp-pools.ks.in
 delete mode 100755 tests/kickstart_tests/ntp-pools.sh
 delete mode 100644 tests/kickstart_tests/packages-and-groups-1.ks.in
 delete mode 100755 tests/kickstart_tests/packages-and-groups-1.sh
 delete mode 100644 tests/kickstart_tests/packages-default.ks.in
 delete mode 100755 tests/kickstart_tests/packages-default.sh
 delete mode 100644 tests/kickstart_tests/packages-excludedocs.ks.in
 delete mode 100755 tests/kickstart_tests/packages-excludedocs.sh
 delete mode 100644 tests/kickstart_tests/packages-ignoremissing.ks.in
 delete mode 100755 tests/kickstart_tests/packages-ignoremissing.sh
 delete mode 100644 tests/kickstart_tests/packages-instlangs-1.ks.in
 delete mode 100755 tests/kickstart_tests/packages-instlangs-1.sh
 delete mode 100644 tests/kickstart_tests/packages-instlangs-2.ks.in
 delete mode 100755 tests/kickstart_tests/packages-instlangs-2.sh
 delete mode 100644 tests/kickstart_tests/packages-instlangs-3.ks.in
 delete mode 100755 tests/kickstart_tests/packages-instlangs-3.sh
 delete mode 100644 tests/kickstart_tests/packages-multilib.ks.in
 delete mode 100755 tests/kickstart_tests/packages-multilib.sh
 delete mode 100644 tests/kickstart_tests/pre-install.ks.in
 delete mode 100755 tests/kickstart_tests/pre-install.sh
 delete mode 100644 tests/kickstart_tests/proxy-auth.ks.in
 delete mode 100755 tests/kickstart_tests/proxy-auth.sh
 delete mode 100644 tests/kickstart_tests/proxy-cmdline.ks.in
 delete mode 100755 tests/kickstart_tests/proxy-cmdline.sh
 delete mode 100644 tests/kickstart_tests/proxy-kickstart.ks.in
 delete mode 100755 tests/kickstart_tests/proxy-kickstart.sh
 delete mode 100644 tests/kickstart_tests/raid-1.ks.in
 delete mode 100755 tests/kickstart_tests/raid-1.sh
 delete mode 100644 tests/kickstart_tests/reqpart.ks.in
 delete mode 100755 tests/kickstart_tests/reqpart.sh
 delete mode 100644 tests/kickstart_tests/rootpw.ks.in
 delete mode 100755 tests/kickstart_tests/rootpw.sh
 delete mode 100644 tests/kickstart_tests/scripts/Makefile.prereqs
 delete mode 100644 tests/kickstart_tests/scripts/defaults.sh
 delete mode 100755 tests/kickstart_tests/scripts/find-ip
 delete mode 100755 tests/kickstart_tests/scripts/httpd.py
 delete mode 100755 tests/kickstart_tests/scripts/kstest-runner
 delete mode 100755 tests/kickstart_tests/scripts/make-addon-pkgs.py
 delete mode 100644 tests/kickstart_tests/scripts/proxy.py
 delete mode 100755 tests/kickstart_tests/scripts/run_kickstart_tests.sh
 delete mode 100755 tests/kickstart_tests/scripts/run_one_ks.sh
 delete mode 100755 tests/kickstart_tests/scripts/run_report.sh
 delete mode 100644 tests/kickstart_tests/selinux-disabled.ks.in
 delete mode 100755 tests/kickstart_tests/selinux-disabled.sh
 delete mode 100644 tests/kickstart_tests/selinux-enforcing.ks.in
 delete mode 100755 tests/kickstart_tests/selinux-enforcing.sh
 delete mode 100644 tests/kickstart_tests/selinux-permissive.ks.in
 delete mode 100755 tests/kickstart_tests/selinux-permissive.sh
 delete mode 100644 tests/kickstart_tests/services.ks.in
 delete mode 100755 tests/kickstart_tests/services.sh
 delete mode 100644 tests/kickstart_tests/timezoneLOCAL.ks.in
 delete mode 100755 tests/kickstart_tests/timezoneLOCAL.sh
 delete mode 100644 tests/kickstart_tests/timezoneUTC.ks.in
 delete mode 100755 tests/kickstart_tests/timezoneUTC.sh
 delete mode 100644 tests/kickstart_tests/tmpfs-fixed_size.ks.in
 delete mode 100755 tests/kickstart_tests/tmpfs-fixed_size.sh
 delete mode 100644 tests/kickstart_tests/user.ks.in
 delete mode 100755 tests/kickstart_tests/user.sh
 delete mode 100644 tests/kickstart_tests/vlan.ks.in
 delete mode 100755 tests/kickstart_tests/vlan.sh

diff --git a/docs/kickstart-tests.rst b/docs/kickstart-tests.rst
deleted file mode 100644
index 3bd9b33..0000000
--- a/docs/kickstart-tests.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-
-.. include:: ../tests/kickstart_tests/README.rst
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f48cd4f..be2bdf0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,9 +49,6 @@ dist_check_SCRIPTS = $(srcdir)/glade/*.py \
 		     gettext_tests/gettext_warnings.sh \
 		     storage/run_storage_tests.py \
 		     install/run_install_test.sh \
-		     $(srcdir)/kickstart_tests/*.ks.in \
-		     $(srcdir)/kickstart_tests/*.sh \
-		     $(srcdir)/kickstart_tests/scripts/* \
 		     $(srcdir)/gui/*.ks \
 		     $(srcdir)/gui/*.sh \
 		     $(srcdir)/gui/inside/*.py \
@@ -68,8 +65,7 @@ TESTS = nosetests.sh \
 	gettext_tests/style_guide.py \
 	gettext_tests/contexts.py \
 	storage/run_storage_tests.py \
-	glade/run_glade_tests.py \
-	kickstart_tests/scripts/run_kickstart_tests.sh
+	glade/run_glade_tests.py
 
 clean-local:
 	-rm -rf pylint/.pylint.d
diff --git a/tests/README.rst b/tests/README.rst
index cd259d4..5380285 100644
--- a/tests/README.rst
+++ b/tests/README.rst
@@ -56,9 +56,6 @@ represents a different class of tests. They are
   accessibility module. All tests are executed inside a LiveCD;
 - *install/* - basic RPM sanity test. Checks if anaconda.rpm can be installed in
   a temporary directory without failing dependencies or other RPM issues;
-- *kickstart_tests/* - each test is a kickstart file and a shell script. The
-  test runner provisions a virtual machine using boot.iso and a kickstart file.
-  A shell script then verifies installation was as expected;
 - *lib/* - helper modules used during testing;
 - *pyanaconda_tests/* - unit tests for the :mod:`pyanaconda` module;
 - *pylint/* - checks the validity of Python source code using the *pocketlint*
diff --git a/tests/kickstart_tests/README.rst b/tests/kickstart_tests/README.rst
deleted file mode 100644
index 5408253..0000000
--- a/tests/kickstart_tests/README.rst
+++ /dev/null
@@ -1,73 +0,0 @@
-Kickstart Test Documentation
-****************************
-
-:Authors:
-   Chris Lumens <clumens at redhat.com>
-
-Chapter 1. Environment Variables
-================================
-
-A lot of tests need configuration.  This is information that is required by
-tests but typically cannot be hard coded.  Typically, this configuration is
-a package repository needed for testing an installation method.  It is up to
-the user running the tests to do whatever local setup is required and set
-these configuration parameters.
-
-Configuration parameters come from the environment.  All environment variables
-starting with KSTEST_ will be grabbed by run_kickstart_tests.sh and
-automatically substituted in to the kickstart file before it is run.  In the
-kickstart file, the target of a substitution is any string starting with
- at KSTEST_ and ending with another @.  This is similar to how the autotools work.
-
-Configuration parameters may also come from special shell scripts that are
-sourced during run_kickstart_tests.sh.  It will first look at the defaults in
-kickstart_tests/scripts/defaults.sh.  It will then look at any user-specific
-defaults in ~/.kstests.defaults.sh.  These take precedence over the local
-environment.  Environment variables set on the command line have the highest
-priority.
-
-Note that not every test needs every setting.  You can determine which are
-required for the test you are running by simply running "grep KSTEST_" on it.
-
-The following environment variables are currently supported:
-
-- KSTEST_HTTP_ADDON_REPO - This variable is a URL that points to an addon
-  repository.  It is only needed if you are testing that functionality, not
-  if you are testing something else that just happens to use the url command.
-  It will be set up for you automatically with a web server and auto-generated
-  packages.  There is no need to specify this variable.
-
-- KSTEST_LIVEIMG_CHECKSUM - This variable is the checksum of the image given
-  by KSTEST_LIVEIMG_URL.  It is only needed if you are testing the liveimg
-  command.  It will be set up for you automatically.  There is no need to
-  specify this variable.
-
-- KSTEST_LIVEIMG_URL - This variable is a URL that points to an install.img
-  that is used by the liveimg command.  It is only needed if you are testing
-  that command.  It will be set up for you automatically based on the boot.iso
-  specified on the command line.  There is no need to specify this variable.
-
-- KSTEST_NFS_ADDON_REPO - This variable points to an NFS server and path where
-  an addon repository can be found.  This is different from KSTEST_NFS_PATH
-  and KSTEST_NFS_SERVER.  Those are used with the nfs command.  This variable
-  is used with the repo command, and its format is different.  Here, it takes
-  the form of nfs://<server>:<path>.  See the kickstart documentation.  You
-  will need to set up your own NFS server.
-
-- KSTEST_NFS_PATH - This variable points to the path of a package repository
-  on the NFS server given by KSTEST_NFS_SERVER.  It is only needed if you are
-  testing the nfs command and installation method.  You will need to set up
-  your own NFS server.
-
-- KSTEST_NFS_SERVER - This variable points at an NFS server, and is only needed
-  if you are testing the nfs command and installation method.  You will need to
-  set up your own NFS server.
-
-- KSTEST_OSTREE_REPO - This variable points at the atomic repo, and is only
-  needed if you are testing the ostreesetup command and installation method.
-  You will need to set up your own repo.
-
-- KSTEST_URL - This variable is used by all tests that don't test installation
-  method and instead just use the default.  It is set to the Fedora mirrors in
-  kickstart_tests/scripts/defaults.sh.  This is potentially slow if you are
-  running a lot of tests, and you may want to point it at a local mirror.
diff --git a/tests/kickstart_tests/basic-ftp.ks.in b/tests/kickstart_tests/basic-ftp.ks.in
deleted file mode 100644
index 100a97e..0000000
--- a/tests/kickstart_tests/basic-ftp.ks.in
+++ /dev/null
@@ -1,22 +0,0 @@
-url --url=ftp://mirror.utexas.edu/pub/fedora/linux/development/rawhide/$basearch/os/
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-%end
-
-%post
-# If we made it post, that's good enough
-echo SUCCESS > /root/RESULT
-%end
diff --git a/tests/kickstart_tests/basic-ftp.sh b/tests/kickstart_tests/basic-ftp.sh
deleted file mode 100755
index 5accada..0000000
--- a/tests/kickstart_tests/basic-ftp.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="method"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/basic-ostree.ks.in b/tests/kickstart_tests/basic-ostree.ks.in
deleted file mode 100644
index a21b93d..0000000
--- a/tests/kickstart_tests/basic-ostree.ks.in
+++ /dev/null
@@ -1,20 +0,0 @@
-# Substitute something in for REPO or this will all come crashing down.
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=@KSTEST_OSTREE_REPO@ --ref=fedora-atomic/rawhide/x86_64/base/core
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%post --nochroot
-mkdir -p /mnt/sysimage/root/
-echo SUCCESS > /mnt/sysimage/root/RESULT
-%end
diff --git a/tests/kickstart_tests/basic-ostree.sh b/tests/kickstart_tests/basic-ostree.sh
deleted file mode 100755
index 6c32871..0000000
--- a/tests/kickstart_tests/basic-ostree.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2014  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="method"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/bond.ks.in b/tests/kickstart_tests/bond.ks.in
deleted file mode 100644
index eea7589..0000000
--- a/tests/kickstart_tests/bond.ks.in
+++ /dev/null
@@ -1,56 +0,0 @@
-url @KSTEST_URL@
-install
-network --device=link --bootproto=dhcp
-
-# Create testing bond interface
-network --device=bond0 --bootproto=dhcp --bondslaves=link --activate
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-%end
-
-%post
-IF_FILE='/etc/sysconfig/network-scripts/ifcfg-bond0'
-
-if [[ -e $IF_FILE ]]; then
-   cp $IF_FILE /root/
-else
-   echo '*** ifcfg file for bond interface missing' >> /root/RESULT
-   exit 0
-fi
-
-grep -q '^DEVICE=bond0$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** DEVICE is not present' >> /root/RESULT
-fi
-
-grep -q '^TYPE=Bond$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** TYPE is not present' >> /root/RESULT
-fi
-
-grep -q '^ONBOOT=yes$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** ONBOOT is not present' >> /root/RESULT
-fi
-
-grep -q '^BOOTPROTO=dhcp$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** BOOTPROTO is not present' >> /root/RESULT
-fi
-
-# No error was written to /root/RESULT file, everything is OK
-if [[ ! -e /root/RESULT ]]; then
-   echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/bond.sh b/tests/kickstart_tests/bond.sh
deleted file mode 100755
index 0c97d62..0000000
--- a/tests/kickstart_tests/bond.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="network"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/btrfs-1.ks.in b/tests/kickstart_tests/btrfs-1.ks.in
deleted file mode 100644
index ec39970..0000000
--- a/tests/kickstart_tests/btrfs-1.ks.in
+++ /dev/null
@@ -1,48 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-
-part --fstype=ext4 --size=500 /boot
-part --fstype=swap --size=500 swap
-part btrfs.10 --fstype="btrfs" --size=4400
-
-btrfs none --label=fedora-btrfs btrfs.10
-
-btrfs / --subvol --name=root fedora-btrfs
-btrfs /home --subvol --name=home fedora-btrfs
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
- at core
-%end
-
-%post
-btrfs filesystem show fedora-btrfs
-if [[ $? != 0 ]]; then
-    echo "*** btrfs volume 'fedora-btrfs' was not found" >> /root/RESULT
-fi
-
-grep "\s/\s" /etc/fstab | grep "subvol=root"
-if [[ $? != 0 ]]; then
-    echo "*** root subvol is not mounted at /" >> /root/RESULT
-fi
-
-grep "\s/home\s" /etc/fstab | grep "subvol=home"
-if [[ $? != 0 ]]; then
-    echo "*** home subvol is not mounted at /home" >> /root/RESULT
-fi
-
-# No error was written to /root/RESULT file, everything is OK
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/btrfs-1.sh b/tests/kickstart_tests/btrfs-1.sh
deleted file mode 100755
index e001e5f..0000000
--- a/tests/kickstart_tests/btrfs-1.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="btrfs storage"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/disk/by-label/fedora-btrfs /root/root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != "SUCCESS" ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
-
diff --git a/tests/kickstart_tests/btrfs-2.ks.in b/tests/kickstart_tests/btrfs-2.ks.in
deleted file mode 100644
index 6f79357..0000000
--- a/tests/kickstart_tests/btrfs-2.ks.in
+++ /dev/null
@@ -1,59 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-
-part --fstype=ext4 --size=500 /boot
-part --fstype=swap --size=500 swap
-part btrfs.10 --fstype="btrfs" --size=2200
-part btrfs.12 --fstype="btrfs" --size=2200
-
-btrfs none --data=raid0 --metadata=raid1 --label=fedora-btrfs btrfs.10 btrfs.12
-
-btrfs / --subvol --name=root fedora-btrfs
-btrfs /home --subvol --name=home fedora-btrfs
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
- at core
-%end
-
-%post
-btrfs filesystem show fedora-btrfs
-if [[ $? != 0 ]]; then
-    echo "*** btrfs volume 'fedora-btrfs' was not found" >> /root/RESULT
-fi
-
-btrfs fi df / | grep "Data,\sRAID0"
-if [[ $? != 0 ]]; then
-    echo "*** btrfs volume data RAID level is not RAID0" >> /root/RESULT
-fi
-
-btrfs fi df / | grep "Metadata,\sRAID1"
-if [[ $? != 0 ]]; then
-    echo "*** btrfs volume metadata RAID level is not RAID1" >> /root/RESULT
-fi
-
-grep "\s/\s" /etc/fstab | grep "subvol=root"
-if [[ $? != 0 ]]; then
-    echo "*** root subvol is not mounted at /" >> /root/RESULT
-fi
-
-grep "\s/home\s" /etc/fstab | grep "subvol=home"
-if [[ $? != 0 ]]; then
-    echo "*** home subvol is not mounted at /home" >> /root/RESULT
-fi
-
-# No error was written to /root/RESULT file, everything is OK
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/btrfs-2.sh b/tests/kickstart_tests/btrfs-2.sh
deleted file mode 100755
index e001e5f..0000000
--- a/tests/kickstart_tests/btrfs-2.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2014  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="btrfs storage"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/disk/by-label/fedora-btrfs /root/root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != "SUCCESS" ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
-
diff --git a/tests/kickstart_tests/container.ks.in b/tests/kickstart_tests/container.ks.in
deleted file mode 100644
index 65b6ce0..0000000
--- a/tests/kickstart_tests/container.ks.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --disabled
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --nocore
--kernel
-bash
-%end
-
-%post
-# (1) No kernel should be installed.
-rpm -q kernel
-if [[ $? == 0 ]]; then
-    echo '*** No kernel package should have been installed' > /root/RESULT
-    exit 1
-fi
-
-# (2) No bootloader package should be installed.
-count=$(rpm -qa grub2\* | wc -l)
-if [[ $count -gt 0 ]]; then
-    echo '*** No bootloader package should have been installed' > /root/RESULT
-    exit 1
-fi
-
-# (3) No authconfig or firewall packages should be installed.
-count=$(rpm -qa authconfig\* firewall\* | wc -l)
-if [[ $count -gt 0 ]]; then
-    echo '*** No authconfig or firewall packages should have been installed' > /root/RESULT
-    exit 1
-fi
-
-# (4) Not too much other stuff should be installed - the packages we asked for,
-# whatever are dependencies of it, and whatever anaconda decided is needed for
-# our storage config.
-count=$(rpm -qa \* | wc -l)
-if [[ $count -gt 200 ]]; then
-    echo '*** Too much stuff was installed' > /root/RESULT
-    exit 1
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/container.sh b/tests/kickstart_tests/container.sh
deleted file mode 100755
index ec90854..0000000
--- a/tests/kickstart_tests/container.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="bootloader packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/default-fstype.ks.in b/tests/kickstart_tests/default-fstype.ks.in
deleted file mode 100644
index dc6c1be..0000000
--- a/tests/kickstart_tests/default-fstype.ks.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --size=500 --label=boot
-part pv.1 --fstype=lvmpv --size=4504
-volgroup fedora pv.1
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --size=4000 --label=root
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_fstype=$(blkid -o value -t LABEL=root -s TYPE)
-if [ $root_fstype != "ext4" ]; then
-    echo "default fstype is incorrect (got $root_fstype; expected ext4)" >> /root/RESULT
-fi
-
-boot_fstype=$(blkid -o value -t LABEL=boot -s TYPE)
-if [ $boot_fstype != "ext4" ]; then
-    echo "default boot fstype is incorrect (got $boot_fstype; expected ext4)" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/default-fstype.sh b/tests/kickstart_tests/default-fstype.sh
deleted file mode 100755
index 4ab581a..0000000
--- a/tests/kickstart_tests/default-fstype.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/driverdisk-disk.ks.in b/tests/kickstart_tests/driverdisk-disk.ks.in
deleted file mode 100644
index 37377de..0000000
--- a/tests/kickstart_tests/driverdisk-disk.ks.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-driverdisk /dev/disk/by-label/TEST_DD
-
-%packages
- at core
-%end
-
-%post --nochroot
-SYSROOT=${ANA_INSTALL_PATH:-/mnt/sysimage}
-RESULTFILE=$SYSROOT/root/RESULT
-fail() { echo "*** $*" >> $RESULTFILE; }
-
-# check the installer environment
-[ -f /lib/modules/`uname -r`/updates/fake-dd.ko ] || fail "kmod not loaded"
-[ -f /usr/bin/fake-dd-bin ] || fail "installer-enhancement not loaded"
-
-# check the installed system
-[ -f $SYSROOT/root/fake-dd-2.ko ] || fail "kmod rpm not installed"
-[ ! -f $SYSROOT/usr/bin/fake-dd-bin ] || \
-    fail "installer-enhancement package installed to target system"
-
-# write successful result if nothing failed
-if [[ ! -e $RESULTFILE ]]; then
-    echo SUCCESS > $RESULTFILE
-fi
-%end
diff --git a/tests/kickstart_tests/driverdisk-disk.sh b/tests/kickstart_tests/driverdisk-disk.sh
deleted file mode 100755
index c862cb2..0000000
--- a/tests/kickstart_tests/driverdisk-disk.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (c) 2015 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Will Woods <wwoods at redhat.com>
-
-TESTTYPE="driverdisk"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    local diskdir="$1"
-    # main disk
-    qemu-img create -q -f qcow2 ${diskdir}/disk-a.img 10G
-    echo "${diskdir}/disk-a.img"
-
-    # driverdisk image
-    ${KSTESTDIR}/../lib/mkdud.py -k -b -L "TEST_DD" ${diskdir}/dd.iso >/dev/null
-    echo "${diskdir}/dd.iso,device=cdrom,readonly=on"
-}
-
-#kernel_args() {
-#    echo inst.dd=/dev/disk/by-label/TEST_DD
-#}
diff --git a/tests/kickstart_tests/encrypt-device.ks.in b/tests/kickstart_tests/encrypt-device.ks.in
deleted file mode 100644
index 368a75c..0000000
--- a/tests/kickstart_tests/encrypt-device.ks.in
+++ /dev/null
@@ -1,32 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part pv.68 --asprimary --fstype="lvmpv" --ondisk=sda --size=7691
-part /boot --asprimary --fstype="ext4" --ondisk=sda --size=500
-volgroup vg01 --pesize=4096 pv.68
-logvol /  --fstype="ext4" --size=5000 --encrypted --name=root_lv --vgname=vg01 --passphrase=OntarioIsAProvince --label=root
-logvol /var  --fstype="ext4" --size=1000 --name=var_lv --vgname=vg01
-logvol swap  --fstype="swap" --size=1024 --name=swap_lv --vgname=vg01
-logvol /home  --fstype="ext4" --grow --size=1 --name=home_lv --vgname=vg01
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --default
-%end
-
-%post
-root_lv_type=$(blkid -ovalue -sTYPE /dev/mapper/vg01-root_lv)
-if [ "$root_lv_type" != "crypto_LUKS" ]; then
-    echo "root LV is not encrypted" > /home/RESULT
-else
-    echo SUCCESS > /home/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/encrypt-device.sh b/tests/kickstart_tests/encrypt-device.sh
deleted file mode 100755
index c42aaf8..0000000
--- a/tests/kickstart_tests/encrypt-device.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Anne Mulhern <amulhern at redhat.com>
-
-TESTTYPE="storage"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /home/RESULT (because / is encrypted) file with results
-    # in it.  Check its contents and decide whether the test finally succeeded
-    # or not.
-    result=$(virt-cat ${args} -m /dev/mapper/vg01-home_lv /RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /home/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
diff --git a/tests/kickstart_tests/escrow-cert.ks.in b/tests/kickstart_tests/escrow-cert.ks.in
deleted file mode 100644
index 497e912..0000000
--- a/tests/kickstart_tests/escrow-cert.ks.in
+++ /dev/null
@@ -1,108 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-part --fstype=ext4 --size=4400 --label=rootfs /
-part --fstype=ext4 --size=500 /boot
-part --fstype=swap --size=500 swap
-
-# Create a partition that's easy to umount and poke at in %post
-# The escrow certificate is created in %pre, below
-part --fstype=ext4 --size=500 --encrypted --passphrase='passphrase' --escrowcert=file:///tmp/escrow_test/escrow.crt --backuppassphrase /home
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%pre
-# Create an nss database for the escrow certificate
-mkdir -p /tmp/escrow_test/nss
-certutil -d /tmp/escrow_test/nss --empty-password -N
-
-# Create a self-signed certificate
-# certutil waits for input if not provided with entropy data (-z). Use some
-# crappy data from urandom in the hope of leaving some entropy for the LUKS
-# operations to use later.
-dd if=/dev/urandom of=/tmp/escrow_test/entropy bs=20 count=1
-certutil -d /tmp/escrow_test/nss -S -x -n escrow_cert \
-    -s 'CN=Escrow Test' -t ',,TC' -z /tmp/escrow_test/entropy
-
-# Export the certificate
-certutil -d /tmp/escrow_test/nss -L -n escrow_cert -a -o /tmp/escrow_test/escrow.crt
-%end
-
-%pre-install
-# Copy the escrow database to the install path so we can use it during %post
-mkdir $ANA_INSTALL_PATH/root
-cp -a /tmp/escrow_test $ANA_INSTALL_PATH/root/
-%end
-
-%packages
-volume_key
-%end
-
-%post
-# First, check that the escrow stuff is there
-ls /root/*-escrow >/dev/null 2>&1
-if [[ $? != 0 ]]; then
-    echo '*** escrow packet was not created' > /root/RESULT
-    exit 1
-fi
-
-ls /root/*-escrow-backup-passphrase >/dev/null 2>&1
-if [[ $? != 0 ]]; then
-    echo '*** backup passphrase was not created' > /root/RESULT
-    exit 1
-fi
-
-# Get the LUKS device UUID from the escrow packet filename
-uuid="$(basename /root/*-escrow | sed 's|-escrow$||')"
-
-# umount and close the LUKS device
-umount /home
-cryptsetup close /dev/mapper/luks-$uuid
-
-# Try out the backup passphrase
-backup_passphrase="$(volume_key --secrets -d /root/escrow_test/nss /root/$uuid-escrow-backup-passphrase | sed -n '/^Passphrase:/s|^Passphrase:[[:space:]]*||p')"
-
-if [[ $? != 0 ]] || [[ -z "$backup_passphrase" ]]; then
-    echo '*** unable to parse backup passphrase' > /root/RESULT
-    exit 1
-fi
-
-echo -n $backup_passphrase | cryptsetup open -q --key-file - --type luks --test-passphrase /dev/disk/by-uuid/$uuid
-if [[ $? != 0 ]]; then
-    echo '*** unable to decrypt volume with backup passphrase' > /root/RESULT
-    exit 1
-fi
-
-# Restore access to the volume with the escrow packet
-# First, re-encrypt the packet with a passphrase
-echo -n -e 'packet passphrase\0packet passphrase\0' | volume_key --reencrypt -b -d /root/escrow_test/nss /root/$uuid-escrow -o /root/escrow-out
-if [[ $? != 0 ]] || [[ ! -f /root/escrow-out ]]; then
-    echo '*** unable to reencrypt escrow packet' > /root/RESULT
-    exit 1
-fi
-
-# Use the escrow packet to set a new passphrase on the LUKS volume
-echo -n -e 'packet passphrase\0volume passphrase\0volume passphrase\0' | volume_key --restore -b /dev/disk/by-uuid/$uuid /root/escrow-out
-if [[ $? != 0 ]]; then
-    echo '*** unable to restore volume access with escrow packet' > /root/RESULT
-    exit 1
-fi
-
-# Make sure the new passphrase actually works
-echo -n 'volume passphrase' | cryptsetup open -q --key-file - --type luks --test-passphrase /dev/disk/by-uuid/$uuid
-if [[ $? != 0 ]]; then
-    echo '*** unable to open volume with restored passphrase' > /root/RESULT
-    exit 1
-fi
-
-echo 'SUCCESS' > /root/RESULT
-
-%end
diff --git a/tests/kickstart_tests/escrow-cert.sh b/tests/kickstart_tests/escrow-cert.sh
deleted file mode 100755
index dbb78f7..0000000
--- a/tests/kickstart_tests/escrow-cert.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="storage"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/disk/by-label/rootfs /root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
diff --git a/tests/kickstart_tests/firewall.ks.in b/tests/kickstart_tests/firewall.ks.in
deleted file mode 100644
index d25198f..0000000
--- a/tests/kickstart_tests/firewall.ks.in
+++ /dev/null
@@ -1,59 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard en
-lang en
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-# TEST: firewall
-firewall --enable --port=22001:tcp,6400:udp --service=tftp,smtp
-
-%packages
-%end
-
-%post
-
-## TEST PROCEDURE
-# Test for 22001/TCP
-firewall-offline-cmd --list-ports | grep 22001/tcp
-if [[ $? -ne 0 ]]; then
-    echo "*** Firewall config for 22001/tcp" >> /root/RESULT
-fi
-
-# Test for 6400/UDP
-firewall-offline-cmd --list-ports | grep 6400/udp
-if [[ $? -ne 0 ]]; then
-    echo "*** Firewall config for 6400/udp failed" >> /root/RESULT
-fi
-
-# Test for service tftp
-firewall-offline-cmd --list-services | grep tftp
-if [[ $? -ne 0 ]]; then
-    echo "*** Firewall service tftp not assigned" >> /root/RESULT
-fi
-
-# Test for service smtp
-firewall-offline-cmd --list-services | grep smtp
-if [[ $? -ne 0 ]]; then
-    echo "*** Firewall service smtp not assigned" >> /root/RESULT
-fi
-
-# Test for service sane (disabled)
-firewall-offline-cmd --list-services | grep sane
-if [[ $? -ne 1 ]]; then
-    echo "*** Firewall service sane enabled, should be disabled" >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/firewall.sh b/tests/kickstart_tests/firewall.sh
deleted file mode 100755
index 0c97d62..0000000
--- a/tests/kickstart_tests/firewall.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="network"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/functions.sh b/tests/kickstart_tests/functions.sh
deleted file mode 100644
index 8eff19f..0000000
--- a/tests/kickstart_tests/functions.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2015  Red Hat, Inc.
-# # This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-prereqs() {
-    # No prereqs by default
-    echo
-}
-
-kernel_args() {
-    echo vnc debug=1 inst.debug
-}
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    echo ${ks}
-}
-
-prepare_disks() {
-    tmpdir=$1
-
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 10G
-    echo ${tmpdir}/disk-a.img
-}
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/mapper/fedora-root /root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
-
-cleanup() {
-    tmpdir=$1
-}
-
-start_httpd() {
-    local httpd_root=$1
-    local tmpdir=$2
-
-    # Starts a http server rooted in $httpd_root. The PID of the server will be
-    # written to $tmpdir/httpd-pid, and the URL for the server will be set in
-    # $httpd_url
-
-    local scriptdir=${PWD}/kickstart_tests/scripts
-    local httpd_info="$(${scriptdir}/httpd.py "${httpd_root}")"
-
-    # Parse out the port and PID
-    local httpd_port="$(echo "$httpd_info" | cut -d ' ' -f 1)"
-    local httpd_pid="$(echo "$httpd_info" | cut -d ' ' -f 2)"
-
-    # Save the PID
-    echo "${httpd_pid}" > ${tmpdir}/httpd-pid
-
-    # Construct a URL
-    httpd_url="http://$(${scriptdir}/find-ip):${httpd_port}/"
-}
diff --git a/tests/kickstart_tests/groups-and-envs-1.ks.in b/tests/kickstart_tests/groups-and-envs-1.ks.in
deleted file mode 100644
index dc3aef1..0000000
--- a/tests/kickstart_tests/groups-and-envs-1.ks.in
+++ /dev/null
@@ -1,36 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
- at core
- at c-development
-@^web-server-environment
-%end
-
-%post
-# We don't have a way of determining if a group/env is installed or not.
-# These sentinel packages will have to do.
-rpm -q httpd
-if [[ $? != 0 ]]; then
-    echo '*** web-server-environment was not installed' > /root/RESULT
-else
-    rpm -q gcc
-    if [[ $? != 0 ]]; then
-        echo '*** c-development was not installed' > /root/RESULT
-    else
-        echo SUCCESS > /root/RESULT
-    fi
-fi
-%end
diff --git a/tests/kickstart_tests/groups-and-envs-1.sh b/tests/kickstart_tests/groups-and-envs-1.sh
deleted file mode 100755
index 814b5a8..0000000
--- a/tests/kickstart_tests/groups-and-envs-1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2014  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/groups-and-envs-2.ks.in b/tests/kickstart_tests/groups-and-envs-2.ks.in
deleted file mode 100644
index 26fa5ca..0000000
--- a/tests/kickstart_tests/groups-and-envs-2.ks.in
+++ /dev/null
@@ -1,80 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-# (1) Test that you can remove a group that's part of an environment.
-@^xfce-desktop-environment
-- at dial-up
-
-# (2) Test that you can add and then remove a group.
- at 3d-printing
-- at 3d-printing
-
-# (3) Test that --optional works.
- at container-management --optional
-
-# (4) Test that --nodefaults works.
- at rpm-development-tools --nodefaults
-%end
-
-%post
-# We don't have a way of determining if a group/env is installed or not.
-# These sentinel packages will have to do.
-
-# Testing #1 - lrzsz is only part of dial-up, and should not be installed.
-rpm -q lrzsz
-if [[ $? == 0 ]]; then
-    echo '*** dial-up group should not have been installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #2 - RepetierHost is only part of 3d-printing, and should not
-# be installed.
-rpm -q RepetierHost
-if [[ $? == 0 ]]; then
-    echo '*** 3d-printing group should not have been installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #3 - docker-registry is only part of container-management, where
-# it is optional, so it should be installed.
-rpm -q docker-registry
-if [[ $? != 0 ]]; then
-    echo '*** docker-registry was not installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #4 - rpm-build is mandatory so it should be installed.  rpmdevtools is
-# default so it should not.  rpmlint is optional so it should not.
-rpm -q rpm-build
-if [[ $? != 0 ]]; then
-    echo '*** Mandatory package from rpm-development-tools was not installed' > /root/RESULT
-    exit 1
-else
-    rpm -q rpmdevtools
-    if [[ $? == 0 ]]; then
-        echo '*** Default package from rpm-development-tools should not have been installed' > /root/RESULT
-        exit 1
-    else
-        rpm -q rpmlint
-        if [[ $? == 0 ]]; then
-            echo '*** Optional package from rpm-development-tools should not have been installed' > /root/RESULT
-            exit 1
-        fi
-    fi
-fi
-
-echo SUCCESS > /root/RESULT
-%end
diff --git a/tests/kickstart_tests/groups-and-envs-2.sh b/tests/kickstart_tests/groups-and-envs-2.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/groups-and-envs-2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/groups-and-envs-3.ks.in b/tests/kickstart_tests/groups-and-envs-3.ks.in
deleted file mode 100644
index 77369ff..0000000
--- a/tests/kickstart_tests/groups-and-envs-3.ks.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
- at container-management
- at core
- at domain-client
- at hardware-support
- at headless-management
- at server-product
- at standard
-%end
-
-%post
-rpm -q fedora-release-server
-if [ $? -eq 0 ]; then
-    echo SUCCESS > /root/RESULT
-else
-    echo '*** Fedora Server default environment was not installed' > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/groups-and-envs-3.sh b/tests/kickstart_tests/groups-and-envs-3.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/groups-and-envs-3.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/hostname.ks.in b/tests/kickstart_tests/hostname.ks.in
deleted file mode 100644
index b7305cd..0000000
--- a/tests/kickstart_tests/hostname.ks.in
+++ /dev/null
@@ -1,38 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-# Set hostname for testing
-network --hostname=testhostname.example.com
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-%end
-
-%post
-HOSTNAME="testhostname.example.com"
-
-# Check if hostname is set to the system
-grep -q "^${HOSTNAME}$" /etc/hostname
-if [[ $? -ne 0 ]]; then
-    echo '*** hostname is not set to /etc/hostname' >> /root/RESULT
-fi
-
-hostnamectl --static | grep -q "^${HOSTNAME}$"
-if [[ $? -ne 0 ]]; then
-    echo '*** hostnamectl --static does not return correct hostname' >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/hostname.sh b/tests/kickstart_tests/hostname.sh
deleted file mode 100755
index 5d53c42..0000000
--- a/tests/kickstart_tests/hostname.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="network"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/mapper/fedora_testhostname-root /root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != "SUCCESS" ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
diff --git a/tests/kickstart_tests/ignoredisk.ks.in b/tests/kickstart_tests/ignoredisk.ks.in
deleted file mode 100644
index 1f6a3e2..0000000
--- a/tests/kickstart_tests/ignoredisk.ks.in
+++ /dev/null
@@ -1,51 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-clearpart --all --initlabel
-ignoredisk --drives=sdb
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%pre
-# Doing all this here is a lot easier than trying to make virt tools do
-# what I want on the outside.  Also this'll run before storage.
-parted /dev/sdb mklabel msdos
-parted --align=none /dev/sdb mkpart primary 0 1G
-mkfs.ext4 /dev/sdb1
-mkdir /sdb
-mount /dev/sdb1 /sdb
-echo TEST > /sdb/sentinel
-umount /sdb
-rmdir /sdb
-%end
-
-%post
-mkdir /sdb
-mount /dev/sdb1 /sdb
-if [[ $? != 0 ]]; then
-    echo "*** could not mount /dev/sdb1" >> /root/RESULT
-else
-    if [[ ! -f /sdb/sentinel ]]; then
-        echo "*** /sdb/sentinel no longer exists" >> /root/RESULT
-    elif [[ "$(cat /sdb/sentinel)" != "TEST" ]]; then
-        echo "*** /sdb/sentinel has changed contents" >> /root/RESULT
-    fi
-
-    umount /sdb
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/ignoredisk.sh b/tests/kickstart_tests/ignoredisk.sh
deleted file mode 100755
index 10c8c3b..0000000
--- a/tests/kickstart_tests/ignoredisk.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="raid storage"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    tmpdir=$1
-
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 10G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-b.img 10G
-    echo ${tmpdir}/disk-a.img ${tmpdir}/disk-b.img
-}
diff --git a/tests/kickstart_tests/keyboard-addtnl.ks.in b/tests/kickstart_tests/keyboard-addtnl.ks.in
deleted file mode 100644
index 4a27257..0000000
--- a/tests/kickstart_tests/keyboard-addtnl.ks.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard --vckeymap cz --xlayouts=cz,fi
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
- at core
-%end
-
-%post
-VCKBD="cz"
-XKBD="cz,fi"
-
-KBD=`grep KEYMAP /etc/vconsole.conf | awk -F\" '{ print $2 }'`
-echo "$KBD"
-
-if [[ "$KBD" != "$VCKBD" ]]; then
-    echo '*** specified vconsole keyboard was not set' >> /root/RESULT
-fi
-
-ADDTNL=`grep XkbLayout /etc/X11/xorg.conf.d/00-keyboard.conf | awk -F\" '{ print $4 }'`
-echo "$ADDTNL"
-
-if [[ "$ADDTNL" != "$XKBD" ]]; then
-    echo '*** specified xlayout(s) not set' >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/keyboard-addtnl.sh b/tests/kickstart_tests/keyboard-addtnl.sh
deleted file mode 100755
index 157f91e..0000000
--- a/tests/kickstart_tests/keyboard-addtnl.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="keyboard i18n"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/keyboard.ks.in b/tests/kickstart_tests/keyboard.ks.in
deleted file mode 100644
index a9bffce..0000000
--- a/tests/kickstart_tests/keyboard.ks.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard --vckeymap cz --xlayouts=cz
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
- at core
-%end
-
-%post
-INSTKBD="cz"
-KBD=`grep KEYMAP /etc/vconsole.conf | awk -F\" '{ print $2 }'`
-echo "$KBD"
-
-if [[ "$KBD" != "$INSTKBD" ]]; then
-    echo '*** specified keyboard was not set' >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/keyboard.sh b/tests/kickstart_tests/keyboard.sh
deleted file mode 100755
index 157f91e..0000000
--- a/tests/kickstart_tests/keyboard.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="keyboard i18n"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/ks-include-post.ks b/tests/kickstart_tests/ks-include-post.ks
deleted file mode 100644
index bc57fcf..0000000
--- a/tests/kickstart_tests/ks-include-post.ks
+++ /dev/null
@@ -1,4 +0,0 @@
-%post
-# If this is being run, it's a success
-echo SUCCESS > /root/RESULT
-%end
diff --git a/tests/kickstart_tests/ks-include.ks.in b/tests/kickstart_tests/ks-include.ks.in
deleted file mode 100644
index 86ed930..0000000
--- a/tests/kickstart_tests/ks-include.ks.in
+++ /dev/null
@@ -1,20 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-%end
-
-# Include a kickstart that contains %post
-%include KS-TEST-INCLUDE
diff --git a/tests/kickstart_tests/ks-include.sh b/tests/kickstart_tests/ks-include.sh
deleted file mode 100755
index b8636eb..0000000
--- a/tests/kickstart_tests/ks-include.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="kickstart"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    # Copy the included kickstart to a directory in tmpdir
-    mkdir ${tmpdir}/http
-    cp $(dirname ${ks})/ks-include-post.ks ${tmpdir}/http
-
-    # Start a http server to serve the included file
-    start_httpd ${tmpdir}/http $tmpdir
-
-    # Set the URL of the included file
-    sed -e "/^%include/ s|KS-TEST-INCLUDE|${httpd_url}/ks-include-post.ks|" ${ks} > ${tmpdir}/ks.cfg
-    echo ${tmpdir}/ks.cfg
-}
-
-cleanup() {
-    tmpdir=$1
-
-    if [ -f ${tmpdir}/httpd-pid ]; then
-        kill $(cat ${tmpdir}/httpd-pid)
-    fi
-}
diff --git a/tests/kickstart_tests/lang-2.ks.in b/tests/kickstart_tests/lang-2.ks.in
deleted file mode 100644
index 785d61f..0000000
--- a/tests/kickstart_tests/lang-2.ks.in
+++ /dev/null
@@ -1,43 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard ara
-lang ar_EG.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-@^xfce-desktop-environment
-%end
-
-%post
-count=$(rpm -qa kacst\* | wc -l)
-if [[ $count -lt 5 ]]; then
-    echo '*** kacst packages were not installed' >> /root/RESULT
-    exit 1
-fi
-
-LANG="ar_EG.UTF-8"
-
-INSTLANG=`cat /etc/locale.conf | awk -F\" '{ print $2 }'`
-
-if [[ "$INSTLANG" != "$LANG" ]]; then
-    echo '*** specified language was not set' >> /root/RESULT
-fi
-
-if ! grep -q "langpack_locales=$LANG" /etc/dnf/plugins/langpacks.conf; then
-    echo '*** /etc/dnf/plugins/langpacks.conf was not set up' >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/lang-2.sh b/tests/kickstart_tests/lang-2.sh
deleted file mode 100755
index a877777..0000000
--- a/tests/kickstart_tests/lang-2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="language i18n"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/lang.ks.in b/tests/kickstart_tests/lang.ks.in
deleted file mode 100644
index ff5660f..0000000
--- a/tests/kickstart_tests/lang.ks.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
- at core
-%end
-
-%post
-LANG="cs_CZ.UTF-8"
-
-INSTLANG=`cat /etc/locale.conf | awk -F\" '{ print $2 }'`
-
-if [[ "$INSTLANG" != "$LANG" ]]; then
-    echo '*** specified language was not set' >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/lang.sh b/tests/kickstart_tests/lang.sh
deleted file mode 100755
index a877777..0000000
--- a/tests/kickstart_tests/lang.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="language i18n"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/liveimg.ks.in b/tests/kickstart_tests/liveimg.ks.in
deleted file mode 100644
index d9d0bbd..0000000
--- a/tests/kickstart_tests/liveimg.ks.in
+++ /dev/null
@@ -1,28 +0,0 @@
-install
-liveimg --url=@KSTEST_LIVEIMG_URL@ --checksum=@KSTEST_LIVEIMG_CHECKSUM@
-
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-
-rootpw qweqwe
-shutdown
-
-%post
-if [[ ! -e /etc/passwd ]]; then
-    echo "*** liveimg installation failed ***" > /root/RESULT
-fi
-
-# Final check
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/liveimg.sh b/tests/kickstart_tests/liveimg.sh
deleted file mode 100755
index d1b135e..0000000
--- a/tests/kickstart_tests/liveimg.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="method"
-
-. ${KSTESTDIR}/functions.sh
-
-prereqs() {
-    echo install.img
-}
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    scriptdir=$PWD/kickstart_tests/scripts
-
-    # Copy the install.img to the tmpdir
-    mkdir ${tmpdir}/liveimg
-    cp ${scriptdir}/install.img ${tmpdir}/liveimg
-
-    # Start a http server to serve the install.img
-    start_httpd ${tmpdir}/liveimg ${tmpdir}
-
-    # Add the image and checksum to the kickstart
-    sed -e "s|@KSTEST_LIVEIMG_URL@|${httpd_url}/install.img|" \
-        -e "s|@KSTEST_LIVEIMG_CHECKSUM@|$(sha256sum ${tmpdir}/liveimg/install.img | awk '{print $1;}')|" \
-        ${ks} > ${tmpdir}/kickstart-liveimg.ks
-
-    echo ${tmpdir}/kickstart-liveimg.ks
-}
-
-cleanup() {
-    tmpdir=$1
-
-    if [ -f ${tmpdir}/httpd-pid ]; then
-        kill $(cat ${tmpdir}/httpd-pid)
-    fi
-}
diff --git a/tests/kickstart_tests/lvm-1.ks.in b/tests/kickstart_tests/lvm-1.ks.in
deleted file mode 100644
index 9d0db6c..0000000
--- a/tests/kickstart_tests/lvm-1.ks.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=500
-part pv.1 --fstype=lvmpv --size=4504
-volgroup fedora pv.1
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --size=4000 --fstype=ext4
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype="$(echo $root_mount | cut -d' ' -f3)"
-if [ $root_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry="$(grep ^$root_lv\\s/\\s /etc/fstab)"
-root_uuid_entry="$(grep ^$root_uuid\\s/\\s /etc/fstab)"
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root lv is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root lv
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root)
-if [ $root_lv_size != "4000.00" ]; then
-    echo "*** root lv has incorrect size" >> /root/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID $swap_lv)"
-swap_dm="$(basename $(readlink $swap_lv))"
-if ! grep -q $swap_dm /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry="$(grep ^$swap_lv\\sswap\\s /etc/fstab)"
-swap_uuid_entry="$(grep ^$swap_uuid\\sswap\\s /etc/fstab)"
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-if [ $swap_lv_size != "500.00" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-1.sh b/tests/kickstart_tests/lvm-1.sh
deleted file mode 100755
index f901ac0..0000000
--- a/tests/kickstart_tests/lvm-1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/lvm-2.ks.in b/tests/kickstart_tests/lvm-2.ks.in
deleted file mode 100644
index 646313c..0000000
--- a/tests/kickstart_tests/lvm-2.ks.in
+++ /dev/null
@@ -1,44 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=500
-part pv.1 --fstype=lvmpv --size=5000
-volgroup fedora pv.1
-logvol swap --name=swap --vgname=fedora --percent=10 --fstype=swap
-logvol / --name=root --vgname=fedora --percent=90 --fstype=ext4
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-python
-%end
-
-%post
-# verify sizes of lvs match percentages specified
-vg_size=$(vgs --noheadings -o size --unit=m --nosuffix fedora)
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root)
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-root_percentage=$(python -c "print int(round(($root_lv_size*100)/$vg_size))")
-swap_percentage=$(python -c "print int(round(($swap_lv_size*100)/$vg_size))")
-if [ $swap_percentage != "10" ]; then
-    echo "*** swap lv size is incorrect ($swap_lv_size MiB, or ${swap_percentage}%)" >> /root/RESULT
-fi
-
-if [ $root_percentage != "90" ]; then
-    echo "*** root lv size is incorrect ($root_lv_size MiB, or ${root_percentage}%)" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-2.sh b/tests/kickstart_tests/lvm-2.sh
deleted file mode 100755
index f901ac0..0000000
--- a/tests/kickstart_tests/lvm-2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/lvm-cache-1.ks.in b/tests/kickstart_tests/lvm-cache-1.ks.in
deleted file mode 100644
index a3d61e5..0000000
--- a/tests/kickstart_tests/lvm-cache-1.ks.in
+++ /dev/null
@@ -1,173 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=300
-part pv.1 --fstype=lvmpv --size=6500
-part pv.2 --fstype=lvmpv --size=3100
-
-volgroup fedora pv.1 pv.2
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --size=4000 --fstype=ext4 --cachepvs=pv.2 --cachesize=1500 --cachemode=writethrough
-logvol /home --name=home --vgname=fedora --size=2000 --fstype=ext4 --cachepvs=pv.2 --cachesize=1500 --cachemode=writeback
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID "$root_lv")"
-home_lv="/dev/mapper/fedora-home"
-home_uuid="UUID=$(blkid -o value -s UUID "$home_lv")"
-
-# verify root LV is mounted at /mnt/sysimage
-root_mount=$(grep ^$root_lv\\s/\\s /proc/mounts)
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype=$(echo "$root_mount" | cut -d' ' -f3)
-if [ "$root_fstype" != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry=$(grep ^$root_lv\\s/\\s /etc/fstab)
-root_uuid_entry=$(grep ^$root_uuid\\s/\\s /etc/fstab)
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root LV is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root LV
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root|sed -r 's/\s*//')
-if [ "$root_lv_size" != "4000.00" ]; then
-    echo "*** root LV has incorrect size" >> /root/RESULT
-fi
-
-# verify home entry in /etc/fstab is correct
-home_lv_entry=$(grep ^$home_lv\\s/home\\s /etc/fstab)
-home_uuid_entry=$(grep ^$home_uuid\\s/home\\s /etc/fstab)
-if [ -z "$home_lv_entry" -a -z "$home_uuid_entry" ] ; then
-    echo "*** home LV is not the home entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of home LV
-home_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home|sed -r 's/\s*//')
-if [ "$home_lv_size" != "2000.00" ]; then
-    echo "*** home LV has incorrect size" >> /root/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID "$swap_lv")"
-swap_dm=$(basename $(readlink "$swap_lv"))
-if ! grep -q "$swap_dm" /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry=$(grep ^$swap_lv\\sswap\\s /etc/fstab)
-swap_uuid_entry=$(grep ^$swap_uuid\\sswap\\s /etc/fstab)
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap|sed -r 's/\s*//')
-if [ "$swap_lv_size" != "500.00" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-## cache-specific checks
-# verify that root and home LVs are cached
-lvs -o lv_attr --noheadings fedora/root|grep -q '^\s\+C'
-if [ $? != 0 ]; then
-    echo "*** root LV is not cached" >> /root/RESULT
-fi
-lvs -o lv_attr --noheadings fedora/home|grep -q '^\s\+C'
-if [ $? != 0 ]; then
-    echo "*** home LV is not cached" >> /root/RESULT
-fi
-
-# verify size of root LV's cache
-root_cache_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root_cache | sed -r 's/\s*([0-9]+)\..*/\1/')
-root_cache_md_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root_cache_cmeta | sed -r 's/\s*([0-9]+)\..*/\1/')
-root_cache_all=$(($root_cache_size + $root_cache_md_size))
-if [ "$root_cache_all" != "1500" ]; then
-    echo "*** root LV's cache has incorrect size" >> /root/RESULT
-fi
-
-# verify size of home LV's cache
-home_cache_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home_cache | sed -r 's/\s*([0-9]+)\..*/\1/')
-home_cache_md_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home_cache_cmeta | sed -r 's/\s*([0-9]+)\..*/\1/')
-home_cache_all=$(($home_cache_size + $home_cache_md_size))
-if [ "$home_cache_all" != "1500" ]; then
-    echo "*** home LV's cache has incorrect size" >> /root/RESULT
-fi
-
-# verify mode of root LV's cache
-root_cache_mode=$(lvs --noheadings -o cachemode fedora/root|sed -r 's/\s*//')
-if [ "$root_cache_mode" != "writethrough" ]; then
-    echo "*** root LV's cache has wrong mode" >> /root/RESULT
-fi
-
-# verify mode of home LV's cache
-home_cache_mode=$(lvs --noheadings -o cachemode fedora/home|sed -r 's/\s*//')
-if [ "$home_cache_mode" != "writeback" ]; then
-    echo "*** home LV's cache has wrong mode" >> /root/RESULT
-fi
-
-# verify caches are using (only) the right (aka "faster") PV for both data and metadata
-fast_pv=$(pvs --noheadings -o name,size --unit m --nosuffix|egrep '3[0-9]{3}'|sed -r 's/\s+(\S+)\s+.*/\1/')
-
-root_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/root_cache_cdata|wc -l)
-if [ "$root_cache_num_pvs" != "1" ]; then
-    echo "*** root LV's cache is using multiple PVs" >> /root/RESULT
-fi
-home_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/home_cache_cdata|wc -l)
-if [ "$home_cache_num_pvs" != "1" ]; then
-    echo "*** home LV's cache is using multiple PVs" >> /root/RESULT
-fi
-
-root_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/root_cache_cmeta|wc -l)
-if [ "$root_cache_num_pvs" != "1" ]; then
-    echo "*** root LV's cache (meta) is using multiple PVs" >> /root/RESULT
-fi
-home_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/home_cache_cmeta|wc -l)
-if [ "$home_cache_num_pvs" != "1" ]; then
-    echo "*** home LV's cache (meta) is using multiple PVs" >> /root/RESULT
-fi
-
-root_cache_pv=$(lvs -a --noheadings -o devices fedora/root_cache_cdata|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$root_cache_pv" != "$fast_pv" ]; then
-    echo "*** root LV's cache is using wrong PV" >> /root/RESULT
-fi
-home_cache_pv=$(lvs -a --noheadings -o devices fedora/home_cache_cdata|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$home_cache_pv" != "$fast_pv" ]; then
-    echo "*** home LV's cache is using wrong PV" >> /root/RESULT
-fi
-
-root_cache_pv=$(lvs -a --noheadings -o devices fedora/root_cache_cmeta|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$root_cache_pv" != "$fast_pv" ]; then
-    echo "*** root LV's cache (meta) is using wrong PV" >> /root/RESULT
-fi
-home_cache_pv=$(lvs -a --noheadings -o devices fedora/home_cache_cmeta|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$home_cache_pv" != "$fast_pv" ]; then
-    echo "*** home LV's cache (meta) is using wrong PV" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-cache-1.sh b/tests/kickstart_tests/lvm-cache-1.sh
deleted file mode 100755
index 3af035c..0000000
--- a/tests/kickstart_tests/lvm-cache-1.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    tmpdir=$1
-
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 10G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-b.img 10G
-    echo ${tmpdir}/disk-a.img
-    echo ${tmpdir}/disk-b.img
-}
diff --git a/tests/kickstart_tests/lvm-cache-2.ks.in b/tests/kickstart_tests/lvm-cache-2.ks.in
deleted file mode 100644
index bdce14b..0000000
--- a/tests/kickstart_tests/lvm-cache-2.ks.in
+++ /dev/null
@@ -1,175 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=300
-part pv.1 --fstype=lvmpv --size=6600
-part pv.2 --fstype=lvmpv --size=3100
-
-volgroup fedora pv.1 pv.2
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --size=4000 --grow --fstype=ext4 --cachepvs=pv.2 --cachesize=1000 --cachemode=writethrough
-logvol /home --name=home --vgname=fedora --size=1000 --grow --fstype=ext4 --cachepvs=pv.2 --cachesize=1000 --cachemode=writeback
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID "$root_lv")"
-home_lv="/dev/mapper/fedora-home"
-home_uuid="UUID=$(blkid -o value -s UUID "$home_lv")"
-
-# verify root LV is mounted at /mnt/sysimage
-root_mount=$(grep ^$root_lv\\s/\\s /proc/mounts)
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype=$(echo "$root_mount" | cut -d' ' -f3)
-if [ "$root_fstype" != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry=$(grep ^$root_lv\\s/\\s /etc/fstab)
-root_uuid_entry=$(grep ^$root_uuid\\s/\\s /etc/fstab)
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root LV is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root lv
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root | sed -r 's/\s*([0-9]+)\..*/\1/')
-if [ $root_lv_size -le 4000 ]; then
-    echo "*** root lv has incorrect size" >> /root/RESULT
-fi
-
-# verify size of home lv
-home_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home | sed -r 's/\s*([0-9]+)\..*/\1/')
-if [ $home_lv_size -le 1000 ]; then
-    echo "*** home lv has incorrect size" >> /result/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID "$swap_lv")"
-swap_dm=$(basename $(readlink "$swap_lv"))
-if ! grep -q "$swap_dm" /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry=$(grep ^$swap_lv\\sswap\\s /etc/fstab)
-swap_uuid_entry=$(grep ^$swap_uuid\\sswap\\s /etc/fstab)
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap | sed -r 's/\s*([0-9]+)\..*/\1/')
-if [ "$swap_lv_size" != "500" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-# verify that not too much space was left free in the VG
-vg_free="$(vgs -o vg_free_count --noheadings fedora)"
-if [ $vg_free -gt 2 ]; then
-    echo "*** too much free space left in the fedora vg" >> /root/RESULT
-fi
-
-# we don't need to check sizes of grown LVs, the fact that the installation
-# reached this point means everything fit into the VG somehow
-
-## cache-specific checks
-# verify that root and home LVs are cached
-lvs -o lv_attr --noheadings fedora/root|grep -q '^\s\+C'
-if [ $? != 0 ]; then
-    echo "*** root LV is not cached" >> /root/RESULT
-fi
-lvs -o lv_attr --noheadings fedora/home|grep -q '^\s\+C'
-if [ $? != 0 ]; then
-    echo "*** home LV is not cached" >> /root/RESULT
-fi
-
-# verify size of root LV's cache
-root_cache_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root_cache | sed -r 's/\s*([0-9]+)\..*/\1/')
-root_cache_md_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root_cache_cmeta | sed -r 's/\s*([0-9]+)\..*/\1/')
-root_cache_all=$(($root_cache_size + $root_cache_md_size))
-if [ "$root_cache_all" != "1000" ]; then
-    echo "*** root LV's cache has incorrect size" >> /root/RESULT
-fi
-
-# verify size of home LV's cache
-home_cache_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home_cache | sed -r 's/\s*([0-9]+)\..*/\1/')
-home_cache_md_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home_cache_cmeta | sed -r 's/\s*([0-9]+)\..*/\1/')
-home_cache_all=$(($home_cache_size + $home_cache_md_size))
-if [ "$home_cache_all" != "1000" ]; then
-    echo "*** home LV's cache has incorrect size" >> /root/RESULT
-fi
-
-# verify mode of root LV's cache
-root_cache_mode=$(lvs --noheadings -o cachemode fedora/root|sed -r 's/\s*//')
-if [ "$root_cache_mode" != "writethrough" ]; then
-    echo "*** root LV's cache has wrong mode" >> /root/RESULT
-fi
-
-# verify mode of home LV's cache
-home_cache_mode=$(lvs --noheadings -o cachemode fedora/home|sed -r 's/\s*//')
-if [ "$home_cache_mode" != "writeback" ]; then
-    echo "*** home LV's cache has wrong mode" >> /root/RESULT
-fi
-
-# verify caches are using (only) the right (aka "faster") PV for both data and metadata
-fast_pv=$(pvs --noheadings -o name,size --unit m --nosuffix|egrep '3[0-9]{3}'|sed -r 's/\s+(\S+)\s+.*/\1/')
-
-root_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/root_cache_cdata|wc -l)
-if [ "$root_cache_num_pvs" != "1" ]; then
-    echo "*** root LV's cache is using multiple PVs" >> /root/RESULT
-fi
-home_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/home_cache_cdata|wc -l)
-if [ "$home_cache_num_pvs" != "1" ]; then
-    echo "*** home LV's cache is using multiple PVs" >> /root/RESULT
-fi
-
-root_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/root_cache_cmeta|wc -l)
-if [ "$root_cache_num_pvs" != "1" ]; then
-    echo "*** root LV's cache (meta) is using multiple PVs" >> /root/RESULT
-fi
-home_cache_num_pvs=$(lvs -a --noheadings -o devices fedora/home_cache_cmeta|wc -l)
-if [ "$home_cache_num_pvs" != "1" ]; then
-    echo "*** home LV's cache (meta) is using multiple PVs" >> /root/RESULT
-fi
-
-root_cache_pv=$(lvs -a --noheadings -o devices fedora/root_cache_cdata|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$root_cache_pv" != "$fast_pv" ]; then
-    echo "*** root LV's cache is using wrong PV" >> /root/RESULT
-fi
-home_cache_pv=$(lvs -a --noheadings -o devices fedora/home_cache_cdata|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$home_cache_pv" != "$fast_pv" ]; then
-    echo "*** home LV's cache is using wrong PV" >> /root/RESULT
-fi
-
-root_cache_pv=$(lvs -a --noheadings -o devices fedora/root_cache_cmeta|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$root_cache_pv" != "$fast_pv" ]; then
-    echo "*** root LV's cache (meta) is using wrong PV" >> /root/RESULT
-fi
-home_cache_pv=$(lvs -a --noheadings -o devices fedora/home_cache_cmeta|sed -r 's/\s*([^(]+)\(.*/\1/')
-if [ "$home_cache_pv" != "$fast_pv" ]; then
-    echo "*** home LV's cache (meta) is using wrong PV" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-cache-2.sh b/tests/kickstart_tests/lvm-cache-2.sh
deleted file mode 100755
index 3af035c..0000000
--- a/tests/kickstart_tests/lvm-cache-2.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    tmpdir=$1
-
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 10G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-b.img 10G
-    echo ${tmpdir}/disk-a.img
-    echo ${tmpdir}/disk-b.img
-}
diff --git a/tests/kickstart_tests/lvm-raid-1.ks.in b/tests/kickstart_tests/lvm-raid-1.ks.in
deleted file mode 100644
index 561e600..0000000
--- a/tests/kickstart_tests/lvm-raid-1.ks.in
+++ /dev/null
@@ -1,86 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=500
-part raid.01 --size=8000 --ondisk=sda
-part raid.02 --size=8000 --ondisk=sdb
-part raid.03 --size=8000 --ondisk=sdc
-raid pv.01 --level=RAID5 --device=pv.01 raid.01 raid.02 raid.03
-volgroup fedora pv.01
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --grow --size=4000 --fstype=ext4
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype="$(echo $root_mount | cut -d' ' -f3)"
-if [ $root_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry="$(grep ^$root_lv\\s/\\s /etc/fstab)"
-root_uuid_entry="$(grep ^$root_uuid\\s/\\s /etc/fstab)"
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root lv is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root lv
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root | sed -r 's/\s*([0-9]+)\..*/\1/')
-if [ $root_lv_size -le 4000 ]; then
-    echo "*** root lv has incorrect size" >> /root/RESULT
-fi
-
-# verify that not too much space was left free in the VG
-vg_free="$(vgs -o vg_free_count --noheadings fedora)"
-if [ $vg_free -gt 2 ]; then
-    echo "*** too much free space left in the fedora vg" >> /root/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID $swap_lv)"
-swap_dm="$(basename $(readlink $swap_lv))"
-if ! grep -q $swap_dm /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry="$(grep ^$swap_lv\\sswap\\s /etc/fstab)"
-swap_uuid_entry="$(grep ^$swap_uuid\\sswap\\s /etc/fstab)"
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-if [ $swap_lv_size != "500.00" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-raid-1.sh b/tests/kickstart_tests/lvm-raid-1.sh
deleted file mode 100755
index 363a8cb..0000000
--- a/tests/kickstart_tests/lvm-raid-1.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Vratislav Podzimek <vpodzime at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    tmpdir=$1
-
-    # make sure the first disk have some extra space for /boot
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 9G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-b.img 8G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-c.img 8G
-
-    echo ${tmpdir}/disk-a.img
-    echo ${tmpdir}/disk-b.img
-    echo ${tmpdir}/disk-c.img
-}
diff --git a/tests/kickstart_tests/lvm-thinp-1.ks.in b/tests/kickstart_tests/lvm-thinp-1.ks.in
deleted file mode 100644
index 0c1577a..0000000
--- a/tests/kickstart_tests/lvm-thinp-1.ks.in
+++ /dev/null
@@ -1,106 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=500
-part pv.1 --fstype=lvmpv --size=9004
-volgroup fedora pv.1
-logvol swap  --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol none  --name=pool --vgname=fedora --size=7000 --thinpool
-logvol /     --name=root --vgname=fedora --size=6000 --thin --poolname=pool --fstype=ext4
-logvol /home --name=home --vgname=fedora --size=1000 --thin --poolname=pool --fstype=ext4
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype="$(echo $root_mount | cut -d' ' -f3)"
-if [ $root_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry="$(grep ^$root_lv\\s/\\s /etc/fstab)"
-root_uuid_entry="$(grep ^$root_uuid\\s/\\s /etc/fstab)"
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root lv is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root lv
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root)
-if [ $root_lv_size != "6000.00" ]; then
-    echo "*** root lv has incorrect size" >> /root/RESULT
-fi
-
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-home_fstype="$(echo $home_mount | cut -d' ' -f3)"
-if [ $home_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-home' does not contain an ext4 fs" >> /home/RESULT
-fi
-
-# verify home entry in /etc/fstab is correct
-home_lv_entry="$(grep ^$home_lv\\s/home\\s /etc/fstab)"
-home_uuid_entry="$(grep ^$home_uuid\\s/home\\s /etc/fstab)"
-if [ -z "$home_lv_entry" -a -z "$home_uuid_entry" ] ; then
-    echo "*** home lv is not the home entry in /etc/fstab" >> /home/RESULT
-fi
-
-# verify size of home lv
-home_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home)
-if [ $home_lv_size != "1000.00" ]; then
-    echo "*** home lv has incorrect size" >> /home/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID $swap_lv)"
-swap_dm="$(basename $(readlink $swap_lv))"
-if ! grep -q $swap_dm /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry="$(grep ^$swap_lv\\sswap\\s /etc/fstab)"
-swap_uuid_entry="$(grep ^$swap_uuid\\sswap\\s /etc/fstab)"
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-if [ $swap_lv_size != "500.00" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-thinp-1.sh b/tests/kickstart_tests/lvm-thinp-1.sh
deleted file mode 100755
index f901ac0..0000000
--- a/tests/kickstart_tests/lvm-thinp-1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/lvm-thinp-2.ks.in b/tests/kickstart_tests/lvm-thinp-2.ks.in
deleted file mode 100644
index 9b88cc8..0000000
--- a/tests/kickstart_tests/lvm-thinp-2.ks.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-part /boot --fstype=ext4 --size=500
-part pv.1 --fstype=lvmpv --size=9004
-volgroup fedora pv.1
-logvol swap  --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol none  --name=pool --vgname=fedora --size=7000 --thinpool --grow
-logvol /     --name=root --vgname=fedora --size=6000 --thin --poolname=pool --fstype=ext4
-logvol /home --name=home --vgname=fedora --size=1000 --thin --poolname=pool --fstype=ext4
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype="$(echo $root_mount | cut -d' ' -f3)"
-if [ $root_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_lv_entry="$(grep ^$root_lv\\s/\\s /etc/fstab)"
-root_uuid_entry="$(grep ^$root_uuid\\s/\\s /etc/fstab)"
-if [ -z "$root_lv_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root lv is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of root lv
-root_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/root)
-if [ $root_lv_size != "6000.00" ]; then
-    echo "*** root lv has incorrect size" >> /root/RESULT
-fi
-
-root_lv="/dev/mapper/fedora-root"
-root_uuid="UUID=$(blkid -o value -s UUID $root_lv)"
-
-# verify root lv is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_lv\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** lvm lv 'fedora-root' is not mounted at /" >> /root/RESULT
-fi
-
-home_fstype="$(echo $home_mount | cut -d' ' -f3)"
-if [ $home_fstype != "ext4" ]; then
-    echo "*** lvm lv 'fedora-home' does not contain an ext4 fs" >> /home/RESULT
-fi
-
-# verify home entry in /etc/fstab is correct
-home_lv_entry="$(grep ^$home_lv\\s/home\\s /etc/fstab)"
-home_uuid_entry="$(grep ^$home_uuid\\s/home\\s /etc/fstab)"
-if [ -z "$home_lv_entry" -a -z "$home_uuid_entry" ] ; then
-    echo "*** home lv is not the home entry in /etc/fstab" >> /home/RESULT
-fi
-
-# verify size of home lv
-home_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/home)
-if [ $home_lv_size != "1000.00" ]; then
-    echo "*** home lv has incorrect size" >> /home/RESULT
-fi
-
-# verify swap on lvm is active
-swap_lv="/dev/mapper/fedora-swap"
-swap_uuid="UUID=$(blkid -o value -s UUID $swap_lv)"
-swap_dm="$(basename $(readlink $swap_lv))"
-if ! grep -q $swap_dm /proc/swaps ; then
-    echo "*** lvm lv 'fedora-swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_lv_entry="$(grep ^$swap_lv\\sswap\\s /etc/fstab)"
-swap_uuid_entry="$(grep ^$swap_uuid\\sswap\\s /etc/fstab)"
-if [ -z "$swap_lv_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap lv is not in /etc/fstab" >> /root/RESULT
-fi
-
-# verify size of swap lv
-swap_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/swap)
-if [ $swap_lv_size != "500.00" ]; then
-    echo "*** swap lv has incorrect size" >> /root/RESULT
-fi
-
-# verify that the thin pool grew at least a bit (some space will get reserved in
-# the VG for the pool to grow even further when needed so don't check any exact
-# value)
-pool_lv_size=$(lvs --noheadings -o size --unit=m --nosuffix fedora/pool | sed -r 's/\s*([0-9]+)\..*/\1/')
-if [ $pool_lv_size -le 7000 ]; then
-    echo "*** the thin pool didn't grow at all" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/lvm-thinp-2.sh b/tests/kickstart_tests/lvm-thinp-2.sh
deleted file mode 100755
index f901ac0..0000000
--- a/tests/kickstart_tests/lvm-thinp-2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="lvm storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/nfs-repo-and-addon.ks.in b/tests/kickstart_tests/nfs-repo-and-addon.ks.in
deleted file mode 100644
index 636222b..0000000
--- a/tests/kickstart_tests/nfs-repo-and-addon.ks.in
+++ /dev/null
@@ -1,106 +0,0 @@
-nfs --server=@KSTEST_NFS_SERVER@ --dir=@KSTEST_NFS_PATH@
-
-# The addon repos are setup with the following packages:
-# NFS:
-#   - testpkg-nfs-core, to be installed with @core
-#   - testpkg-nfs-addon, to be installed because we ask for it
-#   - testpkg-share1, contains a file /usr/share/testpkg-1/nfs. To be installed by excluding
-#                     the HTTP version, despite http's lower cost.
-#   - testpkg-share2, contains a file /usr/share/testpkg-2/nfs. To be excluded via cost
-# HTTP:
-#   - testpkg-http-core, to be installed with @core
-#   - testpkg-http-addon, to be installed because we ask for it
-#   - testpkg-share1, contains a file /usr/share/testpkg-1/http. To be excluded via excludepkgs.
-#   - testpkg-share2, contains a file /usr/share/testpkg-2/http. To be included because the cost
-#                     is lower.
-repo --name=kstest-nfs --baseurl=@KSTEST_NFS_ADDON_REPO@ --cost=50
-repo --name=kstest-http --baseurl=@KSTEST_HTTP_ADDON_REPO@ --cost=25 --excludepkgs=testpkg-share1 --install
-
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-testpkg-nfs-addon
-testpkg-http-addon
-testpkg-share1
-testpkg-share2
-%end
-
-%post
-status=0
-
-# Check that all the packages were installed
-for pkg in testpkg-nfs-core testpkg-nfs-addon testpkg-http-core testpkg-http-addon \
-           testpkg-share1 testpkg-share2 ; do
-    if ! rpm -q $pkg ; then
-        echo "*** package $pkg was not installed" >> /root/RESULT
-        status=1
-    fi
-done
-
-if [[ "${status}" -eq 0 ]]; then
-    # Check that the right packages were installed
-    if [[ -e /usr/share/testpkg-1/http ]]; then
-        echo "*** wrong version of testpkg-share1 was installed" >> /root/RESULT
-        status=1
-    fi
-
-    if [[ -e /usr/share/testpkg-2/nfs ]]; then
-        echo "*** wrong version of testpkg-share2 was installed" >> /root/RESULT
-        status=1
-    fi
-
-    # Double check that the correct marker files are in place
-    if [[ ! -e /usr/share/testpkg-1/nfs ]]; then
-        echo "*** unable to find marker for testpkg-share1" >> /root/RESULT
-        status=1
-    fi
-
-    if [[ ! -e /usr/share/testpkg-2/http ]]; then
-        echo "*** unable to find marker for testpkg-share2" >> /root/RESULT
-        status=1
-    fi
-fi
-
-repofile=/etc/yum.repos.d/kstest-http.repo
-if [[ "${status}" -eq 0 ]]; then
-    # Check that the repo file got installed
-    if [[ ! -e $repofile ]]; then
-        echo "*** kstest-http.repo was not installed" >> /root/RESULT
-        status=1
-    # Check that it has all the options
-    elif ! grep -q '^baseurl=@KSTEST_HTTP_ADDON_REPO@$' $repofile ; then
-        echo "*** kstest-http.repo is missing the baseurl" >> /root/RESULT
-        status=1
-    elif ! grep -q '^cost=25$' $repofile; then
-        echo "*** kstest-http.repo is missing the cost" >> /root/RESULT
-        status=1
-    elif ! grep -q '^exclude=testpkg-share1$' $repofile; then
-        echo "*** kstest-http.repo is missing the exclude" >> /root/RESULT
-        status=1
-    fi
-fi
-
-if [[ "${status}" -eq 0 ]]; then
-    # Check that the NFS repo file was not installed
-    if [[ -e /etc/yum.repos.d/kstest-nfs.repo ]]; then
-        echo "*** kstest-nfs.repo was installed with --install" >> /root/RESULT
-        status=1
-    fi
-fi
-
-if [[ "${status}" -eq 0 ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/nfs-repo-and-addon.sh b/tests/kickstart_tests/nfs-repo-and-addon.sh
deleted file mode 100755
index f98f5df..0000000
--- a/tests/kickstart_tests/nfs-repo-and-addon.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="method packaging"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    scriptdir=$PWD/kickstart_tests/scripts
-
-    # Create the test repo
-    PYTHONPATH=$PWD/lib:$PYTHONPATH ${scriptdir}/make-addon-pkgs.py $tmpdir
-
-    # Start a http server to serve the test repo
-    start_httpd ${tmpdir}/http ${tmpdir}
-
-    sed -e "s|@KSTEST_HTTP_ADDON_REPO@|${httpd_url}|" ${ks} > ${tmpdir}/kickstart.ks
-    echo ${tmpdir}/kickstart.ks
-}
-
-cleanup() {
-    tmpdir=$1
-
-    if [ -f ${tmpdir}/httpd-pid ]; then
-        kill $(cat ${tmpdir}/httpd-pid)
-    fi
-}
diff --git a/tests/kickstart_tests/ntp-pools.ks.in b/tests/kickstart_tests/ntp-pools.ks.in
deleted file mode 100644
index 28b7866..0000000
--- a/tests/kickstart_tests/ntp-pools.ks.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-# use ntp.cesnet.cz as an NTP server and 0.pool.ntp.org as an NTP pool
-timezone --utc --ntpservers=ntp.cesnet.cz,0.pool.ntp.org,0.pool.ntp.org,0.pool.ntp.org,0.pool.ntp.org Europe/Prague
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --default
-%end
-
-%post
-# server 0.fedora.pool.ntp.org iburst
-egrep '^\s*server\s*ntp\.cesnet\.cz\s*[a-zA-Z]+\s*$' /etc/chrony.conf
-if [ $? -ne 0 ]; then
-    echo '*** ntp.cesnet.cz not configured as an NTP server' >> /root/RESULT
-fi
-
-egrep '^\s*pool\s*0\.pool\.ntp\.org\s*[a-zA-Z]+\s*$' /etc/chrony.conf
-if [ $? -ne 0 ]; then
-    echo '*** 0.pool.ntp.org not configured as an NTP pool' >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-   echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/ntp-pools.sh b/tests/kickstart_tests/ntp-pools.sh
deleted file mode 100755
index b3f16c1..0000000
--- a/tests/kickstart_tests/ntp-pools.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="time"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-and-groups-1.ks.in b/tests/kickstart_tests/packages-and-groups-1.ks.in
deleted file mode 100644
index 6fa712e..0000000
--- a/tests/kickstart_tests/packages-and-groups-1.ks.in
+++ /dev/null
@@ -1,73 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-@^xfce-desktop-environment
-
-# (1) Test that you can remove a package that's part of a group
- at c-development
--valgrind
-
-# (2) Test that you can add and then remove the same package.
-qemu-kvm
--qemu-kvm
-
-# (3) Test that you can add packages with a glob.
-kacst*
-
-# (4) Test that you can remove packages with a glob.
--ibus*
-%end
-
-%post
-# We don't have a way of determining if a group/env is installed or not.
-# These sentinel packages will have to do.
-
-# Testing #1 - gcc should be installed, but not valgrind
-rpm -q gcc
-if [[ $? != 0 ]]; then
-    echo '*** c-development group was not installed' > /root/RESULT
-    exit 1
-fi
-
-rpm -q valgrind
-if [[ $? == 0 ]]; then
-    echo '*** valgrind package should not have been installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #2 - qemu-kvm should not be installed.
-rpm -q qemu-kvm
-if [[ $? == 0 ]]; then
-    echo '*** qemu-kvm package should not have been installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #3 - kacst font stuff should be installed.
-count=$(rpm -qa kacst\* | wc -l)
-if [[ $count -lt 5 ]]; then
-    echo '*** kacst glob was not installed' > /root/RESULT
-    exit 1
-fi
-
-# Testing #4 - ibus stuff should not be installed.
-count=$(rpm -qa ibus\* | wc -l)
-if [[ $count -gt 0 ]]; then
-    echo '*** ibus glob should not have been installed' > /root/RESULT
-    exit 1
-fi
-
-echo SUCCESS > /root/RESULT
-%end
diff --git a/tests/kickstart_tests/packages-and-groups-1.sh b/tests/kickstart_tests/packages-and-groups-1.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-and-groups-1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-default.ks.in b/tests/kickstart_tests/packages-default.ks.in
deleted file mode 100644
index 7ae2af8..0000000
--- a/tests/kickstart_tests/packages-default.ks.in
+++ /dev/null
@@ -1,27 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --default
-%end
-
-%post
-rpm -q fedora-release
-if [ $? -eq 0 ]; then
-    echo SUCCESS > /root/RESULT
-else
-    echo '*** fedora-release package was not installed' > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/packages-default.sh b/tests/kickstart_tests/packages-default.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-default.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-excludedocs.ks.in b/tests/kickstart_tests/packages-excludedocs.ks.in
deleted file mode 100644
index e67e838..0000000
--- a/tests/kickstart_tests/packages-excludedocs.ks.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --excludedocs
- at container-management
- at core
- at domain-client
- at hardware-support
- at headless-management
- at server-product
- at standard
-%end
-
-%post
-if [ ! -d /usr/share/doc ]; then
-    echo SUCCESS > /root/RESULT
-else
-    cd /usr/share/doc
-    count=$(find . -type f | grep -v -E "^\.$" | wc -l)
-
-    if [ $count -eq 0 ]; then
-        dirs=$(find . -type d | grep -v -E "^\.$" | wc -l)
-
-        if [ $dirs -eq 0 ]; then
-            echo SUCCESS > /root/result
-        else
-            echo "SUCCESS - but directories still exist under /usr/share/doc" > /root/RESULT
-        fi
-    else
-        echo "there are files in /usr/share/doc" > /root/RESULT
-        echo >> /root/RESULT
-        find /usr/share/doc >> /root/RESULT
-    fi
-fi
-%end
diff --git a/tests/kickstart_tests/packages-excludedocs.sh b/tests/kickstart_tests/packages-excludedocs.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-excludedocs.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-ignoremissing.ks.in b/tests/kickstart_tests/packages-ignoremissing.ks.in
deleted file mode 100644
index dfdf68e..0000000
--- a/tests/kickstart_tests/packages-ignoremissing.ks.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --ignoremissing
-fake-package-name
-%end
-
-%post
-# If we made it this far, assume it's a success
-echo SUCCESS > /root/RESULT
-%end
diff --git a/tests/kickstart_tests/packages-ignoremissing.sh b/tests/kickstart_tests/packages-ignoremissing.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-ignoremissing.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-instlangs-1.ks.in b/tests/kickstart_tests/packages-instlangs-1.ks.in
deleted file mode 100644
index 335d68d..0000000
--- a/tests/kickstart_tests/packages-instlangs-1.ks.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-# Only install the en_US locale
-%packages --instLangs=en_US
-%end
-
-%post
-# Make sure no non-english .mo files were installed
-molist="$(find /usr/share/locale \( -name 'en' -type d -prune \) -o \( -name 'en[@_]*' -type d -prune \) -o \( -name '*.mo' -print \) )"
-if [ -n "$molist" ]; then
-    echo "*** non-en .mo files were installed" >> /root/RESULT
-fi
-
-# Check that the en_US locale was installed
-localedef --list-archive | grep -a -q '^en_US$'
-if [ $? != 0 ]; then
-    echo "*** en_US was not installed" >> /root/RESULT
-fi
-
-# Check that only the en_US locale and related encodings were installed
-# Use grep -a to force text mode, since sometimes a character will end up in the
-# output that makes grep think it's binary
-other_locales="$(localedef --list-archive | grep -a -v '^en_US$' | grep -a -v '^en_US\.')"
-if [ -n "$other_locales" ]; then
-    echo "*** non-en locales were installed" >> /root/RESULT
-fi
-
-if [ ! -f /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/packages-instlangs-1.sh b/tests/kickstart_tests/packages-instlangs-1.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-instlangs-1.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-instlangs-2.ks.in b/tests/kickstart_tests/packages-instlangs-2.ks.in
deleted file mode 100644
index 2380e11..0000000
--- a/tests/kickstart_tests/packages-instlangs-2.ks.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-# Install no locales
-%packages --instLangs=
-%end
-
-%post
-# Make sure no .mo files were installed
-molist="$(find /usr/share/locale -name '*.mo')"
-if [ -n "$molist" ]; then
-    echo "*** .mo files were installed" >> /root/RESULT
-fi
-
-# Check that no locales were installed.
-other_locales="$(localedef --list-archive)"
-if [ -n "$other_locales" ]; then
-    echo "*** locales were installed" >> /root/RESULT
-fi
-
-if [ ! -f /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/packages-instlangs-2.sh b/tests/kickstart_tests/packages-instlangs-2.sh
deleted file mode 100755
index 4737974..0000000
--- a/tests/kickstart_tests/packages-instlangs-2.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="knownfailure packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-instlangs-3.ks.in b/tests/kickstart_tests/packages-instlangs-3.ks.in
deleted file mode 100644
index 35c945f..0000000
--- a/tests/kickstart_tests/packages-instlangs-3.ks.in
+++ /dev/null
@@ -1,73 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-# Install a short list of languages
-# Use ones with translations in blivet to make them easy to find.
-%packages --instLangs=es:fr:it
-python3-blivet
-%end
-
-%post
-# Make sure the locales we asked for are installed
-if [ ! -f /usr/share/locale/es/LC_MESSAGES/blivet.mo ]; then
-    echo "*** Spanish translations were not installed" >> /root/RESULT
-fi
-
-if [ ! -f /usr/share/locale/fr/LC_MESSAGES/blivet.mo ]; then
-    echo "*** French translations were not installed" >> /root/RESULT
-fi
-
-if [ ! -f /usr/share/locale/it/LC_MESSAGES/blivet.mo ]; then
-    echo "*** Italian translations were not installed" >> /root/RESULT
-fi
-
-# Make sure nothing else got installed
-molist="$(find /usr/share/locale \( -name 'fr' -type d -prune \) -o \
-          \( -name 'es' -type d -prune \) -o \
-          \( -name 'it' -type d -prune \) -o \
-	  -o \( -name 'blivet.mo' -print \) )"
-if [ -n "$molist" ]; then
-    echo "*** unrequested .mo files were installed" >> /root/RESULT
-fi
-
-# Check that the requested locales were installed
-localedef --list-archive | grep -a -q '^es_'
-if [ $? != 0 ]; then
-    echo "*** es locales were not installed" >> /root/RESULT
-fi
-
-localedef --list-archive | grep -a -q '^fr_'
-if [ $? != 0 ]; then
-    echo "*** fr locales were not installed" >> /root/RESULT
-fi
-
-localedef --list-archive | grep -a -q '^it_'
-if [ $? != 0 ]; then
-    echo "*** it locales were not installed" >> /root/RESULT
-fi
-
-# Check that only the requested locales were installed
-# Use grep -a to force text mode, since sometimes a character will end up in the
-# output that makes grep think it's binary
-other_locales="$(localedef --list-archive | grep -a -v -E '^(fr_|es_|it_|french|italian|spanish)')"
-if [ -n "$other_locales" ]; then
-    echo "*** unrequested locales were installed" >> /root/RESULT
-fi
-
-if [ ! -f /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/packages-instlangs-3.sh b/tests/kickstart_tests/packages-instlangs-3.sh
deleted file mode 100755
index 39448bb..0000000
--- a/tests/kickstart_tests/packages-instlangs-3.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/packages-multilib.ks.in b/tests/kickstart_tests/packages-multilib.ks.in
deleted file mode 100644
index e0eafe5..0000000
--- a/tests/kickstart_tests/packages-multilib.ks.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages --multilib
- at container-management
- at core
- at domain-client
- at hardware-support
- at headless-management
- at server-product
- at standard
-%end
-
-%post
-rpm -q fedora-release
-if [ -e /usr/lib/libc.so.6 ]; then
-    echo SUCCESS > /root/RESULT
-else
-    echo '*** no 32-bit libc package installed' > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/packages-multilib.sh b/tests/kickstart_tests/packages-multilib.sh
deleted file mode 100755
index 4737974..0000000
--- a/tests/kickstart_tests/packages-multilib.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="knownfailure packaging"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/pre-install.ks.in b/tests/kickstart_tests/pre-install.ks.in
deleted file mode 100644
index a600290..0000000
--- a/tests/kickstart_tests/pre-install.ks.in
+++ /dev/null
@@ -1,64 +0,0 @@
-url @KSTEST_URL@
-
-install
-
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-
-rootpw qweqwe
-
-shutdown
-
-%pre-install
-# TEST setting up /etc/passwd before package installation
-mkdir $ANA_INSTALL_PATH/etc
-cat > $ANA_INSTALL_PATH/etc/passwd << EOF
-root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/bin:/sbin/nologin
-daemon:x:2:2:daemon:/sbin:/sbin/nologin
-adm:x:3:4:adm:/var/adm:/sbin/nologin
-lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin
-sync:x:5:0:sync:/sbin:/bin/sync
-shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
-halt:x:7:0:halt:/sbin:/sbin/halt
-mail:x:8:12:mail:/var/spool/mail:/sbin/nologin
-operator:x:11:0:operator:/root:/sbin/nologin
-games:x:12:100:games:/usr/games:/sbin/nologin
-ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin
-nobody:x:99:99:Nobody:/:/sbin/nologin
-polipo:x:600:600:Polipo Web Proxy:/var/cache/polipo:/sbin/nologin
-lighttpd:x:601:601:lighttpd web server:/var/www/lighttpd:/sbin/nologin
-EOF
-%end
-
-%packages
-polipo
-lighttpd
-%end
-
-%post
-## TEST pre-install
-grep "polipo:x:600:600" /etc/passwd
-if [[ $? -ne 0 ]]; then
-    echo "*** pre-install failed, wrong polipo entry ***" >> /root/RESULT
-fi
-
-grep "lighttpd:x:601:601" /etc/passwd
-if [[ $? -ne 0 ]]; then
-    echo "*** pre-install failed, wrong lighttpd entry ***" >> /root/RESULT
-fi
-
-# Final check
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/pre-install.sh b/tests/kickstart_tests/pre-install.sh
deleted file mode 100755
index 5b0dabd..0000000
--- a/tests/kickstart_tests/pre-install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="kickstart"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/proxy-auth.ks.in b/tests/kickstart_tests/proxy-auth.ks.in
deleted file mode 100644
index 13bf171..0000000
--- a/tests/kickstart_tests/proxy-auth.ks.in
+++ /dev/null
@@ -1,87 +0,0 @@
-url @KSTEST_URL@ --proxy=http://anaconda:qweqwe@127.0.0.1:8080
-repo --name=kstest-http --baseurl=HTTP-ADDON-REPO --proxy=http://anaconda:qweqwe@127.0.0.1:8080 --install
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-# Install @core, which will also pull in testpkg-http-core from the addon repo
-%packages
-%end
-
-# Start the proxy server
-%include scripts/proxy-common.ks
-
-# Set a password on the proxy server
-%pre
-echo 'anaconda:qweqwe' > /tmp/proxy.password
-%end
-
-%post --nochroot
-# Look for the following as evidence that a proxy was used:
-# a .treeinfo request
-grep -q '\.treeinfo$' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo '.treeinfo request was not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# primary.xml from the repodata
-grep -q 'repodata/.*primary.xml' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'repodata requests were not provxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# the kernel package from the Fedora repo
-grep -q 'kernel-.*\.rpm' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'base repo package requests were not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# testpkg-http-core from the addon repo
-grep -q 'testpkg-http-core.*\.rpm' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'addon repo package requests were not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the addon repo file was installed
-if [[ ! -f $ANA_INSTALL_PATH/etc/yum.repos.d/kstest-http.repo ]]; then
-    echo 'kstest-http.repo does not exist' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the proxy configuration was written to the repo file
-grep -q 'proxy=http://anaconda:qweqwe@127.0.0.1:8080' $ANA_INSTALL_PATH/etc/yum.repos.d/kstest-http.repo
-if [[ $? -ne 0 ]]; then
-    echo 'kstest-http.repo does not contain proxy information' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the installed repo file is usable
-# dnf exits with 0 even if something goes wrong, so do a repoquery and look for
-# the package in the output
-chroot $ANA_INSTALL_PATH \
-    dnf --disablerepo=\* --enablerepo=kstest-http --quiet repoquery testpkg-http-core 2>/dev/null | \
-    grep -q 'testpkg-http-core'
-if [[ $? -ne 0 ]]; then
-    echo 'unable to query kstest-http repo' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Finally, check that the repoquery used the proxy
-tail -1 /tmp/proxy.log | grep -q repodata
-if [[ $? -ne 0 ]]; then
-    echo 'repoquery on installed system was not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# If nothing was written to RESULT, it worked
-if [[ ! -f $ANA_INSTALL_PATH/root/RESULT ]]; then
-    echo 'SUCCESS' > $ANA_INSTALL_PATH/root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/proxy-auth.sh b/tests/kickstart_tests/proxy-auth.sh
deleted file mode 100755
index f42f71d..0000000
--- a/tests/kickstart_tests/proxy-auth.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="method proxy"
-
-. ${KSTESTDIR}/functions.sh
-
-prereqs() {
-    echo proxy-common.ks
-}
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    scriptdir=$PWD/kickstart_tests/scripts
-
-    # Create the test repo
-    PYTHONPATH=$PWD/lib:$PYTHONPATH ${scriptdir}/make-addon-pkgs.py $tmpdir
-
-    # Start a http server to serve the test repo
-    start_httpd ${tmpdir}/http $tmpdir
-
-    # Flatten the kickstart to include the proxy %pre script
-    ( cd "$(dirname ${ks})" && ksflatten -o ${tmpdir}/kickstart.ks -c "$(basename $ks)" )
-
-    sed -e "/^repo/ s|HTTP-ADDON-REPO|${httpd_url}|" ${tmpdir}/kickstart.ks > ${tmpdir}/kickstart-repo.ks
-    echo ${tmpdir}/kickstart-repo.ks
-}
-
-cleanup() {
-    tmpdir=$1
-
-    if [ -f ${tmpdir}/httpd-pid ]; then
-        kill $(cat ${tmpdir}/httpd-pid)
-    fi
-}
diff --git a/tests/kickstart_tests/proxy-cmdline.ks.in b/tests/kickstart_tests/proxy-cmdline.ks.in
deleted file mode 100644
index 0954c6d..0000000
--- a/tests/kickstart_tests/proxy-cmdline.ks.in
+++ /dev/null
@@ -1,41 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-# Just install @core
-%packages
-%end
-
-# Run the proxy
-%include scripts/proxy-common.ks
-
-%post --nochroot
-# Look for the following as evidence that a proxy was used:
-# a .treeinfo request
-# primary.xml from the repodata
-# a package. Let's say kernel, there should definitely have been a kernel
-
-if ! grep -q '\.treeinfo$' /tmp/proxy.log; then
-    result='.treeinfo request was not proxied'
-elif ! grep -q 'repodata/.*primary.xml' /tmp/proxy.log; then
-    result='repodata requests were not proxied'
-elif ! grep -q 'kernel-.*\.rpm' /tmp/proxy.log; then
-    result='package requests were not proxied'
-else
-    result='SUCCESS'
-fi
-
-# Write the result to the installed /root
-echo "$result" > $ANA_INSTALL_PATH/root/RESULT
-%end
diff --git a/tests/kickstart_tests/proxy-cmdline.sh b/tests/kickstart_tests/proxy-cmdline.sh
deleted file mode 100755
index ad93044..0000000
--- a/tests/kickstart_tests/proxy-cmdline.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="method proxy"
-
-. ${KSTESTDIR}/functions.sh
-
-prereqs() {
-    echo proxy-common.ks
-}
-
-kernel_args() {
-    echo vnc inst.proxy=http://127.0.0.1:8080
-}
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    # Flatten the kickstart to include the proxy %pre script
-    ( cd "$(dirname ${ks})" && ksflatten -o ${tmpdir}/kickstart.ks -c "$(basename $ks)" )
-    echo ${tmpdir}/kickstart.ks
-}
diff --git a/tests/kickstart_tests/proxy-kickstart.ks.in b/tests/kickstart_tests/proxy-kickstart.ks.in
deleted file mode 100644
index 490fb64..0000000
--- a/tests/kickstart_tests/proxy-kickstart.ks.in
+++ /dev/null
@@ -1,82 +0,0 @@
-url @KSTEST_URL@ --proxy=127.0.0.1:8080
-repo --name=kstest-http --baseurl=HTTP-ADDON-REPO --proxy=127.0.0.1:8080 --install
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-# Install @core, which will also pull in testpkg-http-core from the addon repo
-%packages
-%end
-
-# Start the proxy server
-%include scripts/proxy-common.ks
-
-%post --nochroot
-# Look for the following as evidence that a proxy was used:
-# a .treeinfo request
-grep -q '\.treeinfo$' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo '.treeinfo request was not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# primary.xml from the repodata
-grep -q 'repodata/.*primary.xml' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'repodata requests were not provxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# the kernel package from the Fedora repo
-grep -q 'kernel-.*\.rpm' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'base repo package requests were not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# testpkg-http-core from the addon repo
-grep -q 'testpkg-http-core.*\.rpm' /tmp/proxy.log
-if [[ $? -ne 0 ]]; then
-    echo 'addon repo package requests were not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the addon repo file was installed
-if [[ ! -f $ANA_INSTALL_PATH/etc/yum.repos.d/kstest-http.repo ]]; then
-    echo 'kstest-http.repo does not exist' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the proxy configuration was written to the repo file
-grep -q 'proxy=http://127.0.0.1:8080' $ANA_INSTALL_PATH/etc/yum.repos.d/kstest-http.repo
-if [[ $? -ne 0 ]]; then
-    echo 'kstest-http.repo does not contain proxy information' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Check that the installed repo file is usable
-# dnf exits with 0 even if something goes wrong, so do a repoquery and look for
-# the package in the output
-chroot $ANA_INSTALL_PATH \
-    dnf --disablerepo=\* --enablerepo=kstest-http --quiet repoquery testpkg-http-core 2>/dev/null | \
-    grep -q 'testpkg-http-core'
-if [[ $? -ne 0 ]]; then
-    echo 'unable to query kstest-http repo' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# Finally, check that the repoquery used the proxy
-tail -1 /tmp/proxy.log | grep -q repodata
-if [[ $? -ne 0 ]]; then
-    echo 'repoquery on installed system was not proxied' >> $ANA_INSTALL_PATH/root/RESULT
-fi
-
-# If nothing was written to RESULT, it worked
-if [[ ! -f $ANA_INSTALL_PATH/root/RESULT ]]; then
-    echo 'SUCCESS' > $ANA_INSTALL_PATH/root/RESULT
-fi
-
-%end
diff --git a/tests/kickstart_tests/proxy-kickstart.sh b/tests/kickstart_tests/proxy-kickstart.sh
deleted file mode 100755
index bdca190..0000000
--- a/tests/kickstart_tests/proxy-kickstart.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-TESTTYPE="method proxy"
-
-. ${KSTESTDIR}/functions.sh
-
-prereqs() {
-    echo proxy-common.ks
-}
-
-prepare() {
-    ks=$1
-    tmpdir=$2
-
-    scriptdir=$PWD/kickstart_tests/scripts
-
-    # Create the test repo
-    PYTHONPATH=$PWD/lib:$PYTHONPATH ${scriptdir}/make-addon-pkgs.py $tmpdir
-
-    # Start a http server to serve the test repo
-    start_httpd ${tmpdir}/http ${tmpdir}
-
-    # Flatten the kickstart to include the proxy %pre script
-    ( cd "$(dirname ${ks})" && ksflatten -o ${tmpdir}/kickstart.ks -c "$(basename $ks)" )
-
-    sed -e "/^repo/ s|HTTP-ADDON-REPO|${httpd_url}|" ${tmpdir}/kickstart.ks > ${tmpdir}/kickstart-repo.ks
-    echo ${tmpdir}/kickstart-repo.ks
-}
-
-cleanup() {
-    tmpdir=$1
-
-    if [ -f ${tmpdir}/httpd-pid ]; then
-        kill $(cat ${tmpdir}/httpd-pid)
-    fi
-}
diff --git a/tests/kickstart_tests/raid-1.ks.in b/tests/kickstart_tests/raid-1.ks.in
deleted file mode 100644
index 7107500..0000000
--- a/tests/kickstart_tests/raid-1.ks.in
+++ /dev/null
@@ -1,108 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-clearpart --all --initlabel
-
-partition raid.01 --size=500 --ondisk=sda --asprimary
-partition raid.02 --size=500 --ondisk=sdb --asprimary
-partition raid.11 --size=4000 --ondisk=sda
-partition raid.12 --size=4000 --ondisk=sdb
-partition raid.21 --size=1024 --ondisk=sda
-partition raid.22 --size=1024 --ondisk=sdb
-
-# Yes, using 0,1,2 is wrong, but /proc/mounts uses /dev/mdX not /dev/md/X
-raid /boot --level=1 --device=0 --fstype=ext4 raid.01 raid.02
-raid swap  --level=1 --device=1 --fstype=swap raid.21 raid.22
-raid /     --level=1 --device=2 --fstype=ext4 --label=rootfs raid.11 raid.12
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-# Verify the / raid level
-root_raidlevel="$(grep ^md2.*active\\sraid1 /proc/mdstat)"
-if [ -z  "$root_raidlevel" ]; then
-    echo "*** mdraid 'root' is not a RAID1" >> /root/RESULT
-fi
-
-root_md="/dev/md2"
-root_uuid="UUID=$(blkid -o value -s UUID $root_md)"
-
-# verify root md is mounted at /mnt/sysimage
-root_mount="$(grep ^$root_md\\s/\\s /proc/mounts)"
-if [ -z  "$root_mount" ]; then
-    echo "*** mdraid 'root' is not mounted at /" >> /root/RESULT
-fi
-
-root_fstype="$(echo $root_mount | cut -d' ' -f3)"
-if [ $root_fstype != "ext4" ]; then
-    echo "*** mdraid 'root' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify root entry in /etc/fstab is correct
-root_md_entry="$(grep ^$root_md\\s/\\s /etc/fstab)"
-root_uuid_entry="$(grep ^$root_uuid\\s/\\s /etc/fstab)"
-if [ -z "$root_md_entry" -a -z "$root_uuid_entry" ] ; then
-    echo "*** root md is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-# Verify the swap raid level
-swap_raidlevel="$(grep ^md1.*active\\sraid1 /proc/mdstat)"
-if [ -z  "$swap_raidlevel" ]; then
-    echo "*** mdraid 'swap' is not a RAID1" >> /root/RESULT
-fi
-
-# verify swap on md is active
-swap_md="/dev/md1"
-swap_uuid="UUID=$(blkid -o value -s UUID $swap_md)"
-if ! grep -q $swap_md /proc/swaps ; then
-    echo "*** mdraid 'swap' is not active as swap space" >> /root/RESULT
-fi
-
-# verify swap entry in /etc/fstab is correct
-swap_md_entry="$(grep ^$swap_md\\sswap\\s /etc/fstab)"
-swap_uuid_entry="$(grep ^$swap_uuid\\sswap\\s /etc/fstab)"
-if [ -z "$swap_md_entry" -a -z "$swap_uuid_entry" ] ; then
-    echo "*** swap md is not in /etc/fstab" >> /root/RESULT
-fi
-
-# Verify the boot raid level
-boot_raidlevel="$(grep ^md0.*active\\sraid1 /proc/mdstat)"
-if [ -z  "$boot_raidlevel" ]; then
-    echo "*** mdraid 'boot' is not a RAID1" >> /root/RESULT
-fi
-
-boot_md="/dev/md0"
-boot_uuid="UUID=$(blkid -o value -s UUID $boot_md)"
-
-# verify boot md is mounted at /mnt/sysimage/boot
-boot_mount="$(grep ^$boot_md\\s/boot\\s /proc/mounts)"
-if [ -z "$boot_mount" ]; then
-    echo "*** mdraid 'boot' is not mounted at /boot" >> /root/RESULT
-fi
-
-boot_fstype="$(echo $boot_mount | cut -d' ' -f3)"
-if [ $boot_fstype != "ext4" ]; then
-    echo "*** mdraid 'boot' does not contain an ext4 fs" >> /root/RESULT
-fi
-
-# verify boot entry in /etc/fstab is correct
-boot_md_entry="$(grep ^$boot_md\\s/boot\\s /etc/fstab)"
-boot_uuid_entry="$(grep ^$boot_uuid\\s/boot\\s /etc/fstab)"
-if [ -z "$boot_md_entry" -a -z "$boot_uuid_entry" ] ; then
-    echo "*** boot md is not the root entry in /etc/fstab" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/raid-1.sh b/tests/kickstart_tests/raid-1.sh
deleted file mode 100755
index 4e11cfa..0000000
--- a/tests/kickstart_tests/raid-1.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="raid storage"
-
-. ${KSTESTDIR}/functions.sh
-
-prepare_disks() {
-    tmpdir=$1
-
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-a.img 10G
-    qemu-img create -q -f qcow2 ${tmpdir}/disk-b.img 10G
-    echo ${tmpdir}/disk-a.img ${tmpdir}/disk-b.img
-}
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/disk/by-label/rootfs /root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != SUCCESS* ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
diff --git a/tests/kickstart_tests/reqpart.ks.in b/tests/kickstart_tests/reqpart.ks.in
deleted file mode 100644
index af68075..0000000
--- a/tests/kickstart_tests/reqpart.ks.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-
-reqpart --add-boot
-part pv.1 --fstype=lvmpv --size=4504
-volgroup fedora pv.1
-logvol swap --name=swap --vgname=fedora --size=500 --fstype=swap
-logvol / --name=root --vgname=fedora --size=4000 --label=root
-
-keyboard us
-lang en_US.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-shutdown
-
-%packages
-%end
-
-%post
-# FIXME: This will need to test for other things one day when we support tests on other arches
-boot_mount="$(grep boot /proc/mounts)"
-if [ -z "${boot_mount}" ]; then
-    echo "*** no /boot mount point was created by reqpart" >> /root/RESULT
-fi
-
-# Also verify the partitions we explicitly asked for got made.
-root_fstype=$(blkid -o value -t LABEL=root -s TYPE)
-if [ "${root_fstype}" != "ext4" ]; then
-    echo "default fstype is incorrect (got $root_fstype; expected ext4)" >> /root/RESULT
-fi
-
-if [ ! -e /root/RESULT ]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/reqpart.sh b/tests/kickstart_tests/reqpart.sh
deleted file mode 100755
index 4ab581a..0000000
--- a/tests/kickstart_tests/reqpart.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="storage"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/rootpw.ks.in b/tests/kickstart_tests/rootpw.ks.in
deleted file mode 100644
index 7fc8072..0000000
--- a/tests/kickstart_tests/rootpw.ks.in
+++ /dev/null
@@ -1,50 +0,0 @@
-url @KSTEST_URL@
-
-install
-
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-
-rootpw qweqwe
-
-shutdown
-
-# Something ought to pull in python for %post, but ask for it just in case
-%packages
-python3
-%end
-
-%post --interpreter=/usr/bin/python3
-import sys
-import crypt
-
-with open("/root/RESULT", "w") as result:
-    # Test that the root password is what we expect it to be
-    with open("/etc/shadow", "r") as f:
-        for line in f:
-            if line.startswith("root:"):
-                shadow_fields = line.strip().split(":")
-                break
-        else:
-            print("Unable to find root password", file=result)
-            sys.exit(0)
-
-    if crypt.crypt("qweqwe", shadow_fields[1]) != shadow_fields[1]:
-        print("Root password is not correct: %s" % shadow_fields[1], file=result)
-        sys.exit(0)
-
-    if shadow_fields[2] != "":
-        print("Date of last password change is not empty: %s" % shadow_fields[2], file=result)
-        sys.exit(0)
-
-    print("SUCCESS", file=result)
-%end
diff --git a/tests/kickstart_tests/rootpw.sh b/tests/kickstart_tests/rootpw.sh
deleted file mode 100755
index ca6a124..0000000
--- a/tests/kickstart_tests/rootpw.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="users"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/scripts/Makefile.prereqs b/tests/kickstart_tests/scripts/Makefile.prereqs
deleted file mode 100644
index 11293a4..0000000
--- a/tests/kickstart_tests/scripts/Makefile.prereqs
+++ /dev/null
@@ -1,28 +0,0 @@
-# Use this Makefile and the prereqs() function to define any objects that need
-# to be built for a particular kickstart test that could be shared by multiple
-# tests. The Makefile is run with PWD = .../kickstart_tests/scripts. The
-# following environment variables are available:
-#
-# IMAGE - the boot.iso
-# KSTESTDIR - the absolute path to the kickstart_tests directory, sans scripts/
-#
-# This file is used before gaining root privileges but sudo probably works if
-# you need it.
-
-# This is a regular Makefile without any automake weirdness, so just keep it
-# friendly.
-
-proxy-common.ks: proxy.py
-	@# Wrap the proxy server in a %pre script that writes the server file to
-	@# to location in the installer environment and runs it in the background
-	@server_py="$$(< proxy.py)"; \
-	echo '%pre --erroronfail' > $@
-	echo 'cat - << "EOF" > /tmp/proxy-test.py' >> $@
-	cat proxy.py >> $@
-	echo 'EOF' >> $@
-	echo 'python3 /tmp/proxy-test.py > /dev/null 2>&1 &' >> $@
-	echo '%end' >> $@
-
-install.img: ${IMAGE}
-	@# Extract the install.img from a boot.iso
-	isoinfo -i $${IMAGE} -R -x /images/install.img > $@
diff --git a/tests/kickstart_tests/scripts/defaults.sh b/tests/kickstart_tests/scripts/defaults.sh
deleted file mode 100644
index a3435ef..0000000
--- a/tests/kickstart_tests/scripts/defaults.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# Default settings that work for everyone, but may not be optimal.
-
-# Where's the package repo for tests that don't care about testing the package
-# source.  This may be slow (especially for large numbers of tests) and you may
-# want to define your own.
-export KSTEST_URL='--mirror=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-rawhide\\&arch=$basearch'
diff --git a/tests/kickstart_tests/scripts/find-ip b/tests/kickstart_tests/scripts/find-ip
deleted file mode 100755
index 5ec2447..0000000
--- a/tests/kickstart_tests/scripts/find-ip
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-# Print something that looks like an externally accessible IPv4 address.
-
-ip addr list | \
-    grep '^[[:space:]]*inet\>.*scope global' | \
-    head -1 | \
-    sed 's/^[[:space:]]*inet \([[:digit:].]*\).*/\1/'
diff --git a/tests/kickstart_tests/scripts/httpd.py b/tests/kickstart_tests/scripts/httpd.py
deleted file mode 100755
index 098fa80..0000000
--- a/tests/kickstart_tests/scripts/httpd.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python3
-#
-# httpd.py - Simple http server
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author(s): David Shea <dshea at redhat.com>
-#
-
-# Usage: httpd.py <directory>
-# If all goes well, it will print the port number it is listening and the child process PID,
-# and then fork to the background and exit from the parent.
-
-from http.server import HTTPServer, SimpleHTTPRequestHandler
-import sys
-import os
-
-if len(sys.argv) != 2:
-    print("Usage: httpd.py <directory>", file=sys.stderr)
-    sys.exit(1)
-
-# Bind to any free port
-server = HTTPServer(('', 0), SimpleHTTPRequestHandler)
-
-# Fork to the background
-pid = os.fork()
-if pid == 0:
-    # chdir to the directory to serve from
-    os.chdir(sys.argv[1])
-
-    # dup the standard file descriptors to /dev/null
-    # pylint: disable=interruptible-system-call, ignorable-system-call
-    os.dup2(os.open(os.devnull, os.O_RDONLY), 0)
-    os.dup2(os.open(os.devnull, os.O_WRONLY), 1)
-    os.dup2(os.open(os.devnull, os.O_WRONLY), 2)
-
-    server.serve_forever()
-
-# Print the port and the PID to stdout
-print("%d %d" % (server.server_port, pid))
-
-# That's it
-sys.exit(0)
diff --git a/tests/kickstart_tests/scripts/kstest-runner b/tests/kickstart_tests/scripts/kstest-runner
deleted file mode 100755
index 196aa36..0000000
--- a/tests/kickstart_tests/scripts/kstest-runner
+++ /dev/null
@@ -1,309 +0,0 @@
-#!/usr/bin/python3
-#
-# kstest-runner - LMC-like program that only does what's necessary for running
-# kickstart-based tests in anaconda
-#
-# Copyright (C) 2011-2015  Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Author(s): Brian C. Lane <bcl at redhat.com>
-#            Chris Lumens <clumens at redhat.com>
-#
-import logging
-log = logging.getLogger("livemedia-creator")
-
-import os
-import sys
-import uuid
-import tempfile
-import subprocess
-from time import sleep
-import argparse
-
-# Use the Lorax treebuilder branch for iso creation
-from pylorax.treebuilder import udev_escape
-from pylorax.executils import execWithRedirect
-
-from pylorax import setup_logging
-from pylorax.monitor import LogMonitor
-from pylorax.mount import IsoMountpoint
-
-import libvirt
-
-class InstallError(Exception):
-    pass
-
-class VirtualInstall(object):
-    """
-    Run virt-install using an iso and a kickstart
-    """
-    def __init__(self, iso, ks_paths, disk_paths,
-                 kernel_args=None, memory=1024, vnc=None,
-                 log_check=None, virtio_host="127.0.0.1", virtio_port=6080):
-        """
-        Start the installation
-
-        :param iso: Information about the iso to use for the installation
-        :type iso: IsoMountpoint
-        :param list ks_paths: Paths to kickstart files. All are injected, the
-           first one is the one executed.
-        :param list disk_paths: Paths to pre-existing disk images.
-        :param str kernel_args: Extra kernel arguments to pass on the kernel cmdline
-        :param int memory: Amount of RAM to assign to the virt, in MiB
-        :param str vnc: Arguments to pass to virt-install --graphics
-        :param log_check: Method that returns True if the installation fails
-        :type log_check: method
-        :param str virtio_host: Hostname to connect virtio log to
-        :param int virtio_port: Port to connect virtio log to
-        """
-        self.virt_name = "LiveOS-"+str(uuid.uuid4())
-        # add --graphics none later
-        # add whatever serial cmds are needed later
-        args = ["-n", self.virt_name,
-                 "-r", str(memory),
-                 "--noreboot",
-                 "--noautoconsole"]
-
-        args.append("--graphics")
-        if vnc:
-            args.append(vnc)
-        else:
-            args.append("none")
-
-        for ks in ks_paths:
-            args.append("--initrd-inject")
-            args.append(ks)
-
-        for disk in disk_paths:
-            args.append("--disk")
-            args.append("path={0}".format(disk))
-
-        if iso.stage2:
-            disk_opts = "path={0},device=cdrom,readonly=on,shareable=on".format(iso.iso_path)
-            args.append("--disk")
-            args.append(disk_opts)
-
-        extra_args = "ks=file:/{0}".format(os.path.basename(ks_paths[0]))
-        if not vnc:
-            extra_args += " inst.cmdline"
-        if kernel_args:
-            extra_args += " " + kernel_args
-        if iso.stage2:
-            extra_args += " stage2=hd:CDLABEL={0}".format(udev_escape(iso.label))
-        args.append("--extra-args")
-        args.append(extra_args)
-
-        args.append("--location")
-        args.append(iso.mount_dir)
-
-        channel_args = "tcp,host={0}:{1},mode=connect,target_type=virtio" \
-                       ",name=org.fedoraproject.anaconda.log.0".format(
-                       virtio_host, virtio_port)
-        args.append("--channel")
-        args.append(channel_args)
-
-        log.info("Running virt-install.")
-        try:
-            execWithRedirect("virt-install", args, raise_err=True)
-        except subprocess.CalledProcessError as e:
-            raise InstallError("Problem starting virtual install: %s" % e)
-
-        conn = libvirt.openReadOnly(None)
-        dom = conn.lookupByName(self.virt_name)
-
-        # TODO: If vnc has been passed, we should look up the port and print that
-        # for the user at this point
-        while dom.isActive() and not log_check():
-            sys.stdout.write(".")
-            sys.stdout.flush()
-            sleep(10)
-        print()
-
-        if log_check():
-            log.info("Installation error detected. See logfile.")
-        else:
-            log.info("Install finished. Or at least virt shut down.")
-
-    def destroy(self, poolName):
-        """
-        Make sure the virt has been shut down and destroyed
-
-        Could use libvirt for this instead.
-        """
-        log.info("Shutting down %s", self.virt_name)
-        subprocess.call(["virsh", "destroy", self.virt_name])
-        subprocess.call(["virsh", "undefine", self.virt_name])
-        subprocess.call(["virsh", "pool-destroy", poolName])
-        subprocess.call(["virsh", "pool-undefine", poolName])
-
-def virt_install(opts, install_log):
-    """
-    Use virt-install to install to a disk image
-
-    :param opts: options passed to livemedia-creator
-    :type opts: argparse options
-    :param str install_log: The path to write the log from virt-install
-
-    This uses virt-install with a boot.iso and a kickstart to create a disk
-    image.
-    """
-    iso_mount = IsoMountpoint(opts.iso, opts.location)
-    log_monitor = LogMonitor(install_log, timeout=opts.timeout)
-
-    kernel_args = ""
-    if opts.kernel_args:
-        kernel_args += opts.kernel_args
-    if opts.proxy:
-        kernel_args += " proxy=" + opts.proxy
-
-    try:
-        virt = VirtualInstall(iso_mount, opts.ks, opts.disk_paths,
-                              kernel_args, opts.ram, opts.vnc,
-                              log_check = log_monitor.server.log_check,
-                              virtio_host = log_monitor.host,
-                              virtio_port = log_monitor.port)
-
-        virt.destroy(os.path.basename(opts.tmp))
-        log_monitor.shutdown()
-    except InstallError as e:
-        log.error("VirtualInstall failed: %s", e)
-        raise
-    finally:
-        log.info("unmounting the iso")
-        iso_mount.umount()
-
-    if log_monitor.server.log_check():
-        if not log_monitor.server.error_line and opts.timeout:
-            msg = "virt_install failed due to timeout"
-        else:
-            msg = "virt_install failed on line: %s" % log_monitor.server.error_line
-        raise InstallError(msg)
-
-
-def make_image(opts):
-    """
-    Install to a disk image
-
-    :param opts: options passed to livemedia-creator
-    :type opts: argparse options
-    :param str ks: Path to the kickstart to use for the installation
-
-    Use virt-install or anaconda to install to a disk image.
-    """
-    try:
-        install_log = os.path.abspath(os.path.dirname(opts.logfile))+"/virt-install.log"
-        log.info("install_log = %s", install_log)
-
-        virt_install(opts, install_log)
-    except InstallError as e:
-        log.error("Install failed: %s", e)
-
-        if not opts.keep_image:
-            log.info("Removing bad disk image")
-
-            for image in opts.disk_paths:
-                if os.path.exists(image):
-                    os.unlink(image)
-
-        raise
-
-    log.info("Disk Image install successful")
-
-def main():
-    parser = argparse.ArgumentParser(description="Run anaconda's kickstart-based tests",
-                                     fromfile_prefix_chars="@")
-
-    parser.add_argument("--iso", type=os.path.abspath,
-                        help="Anaconda installation .iso path to use for virt-install")
-    parser.add_argument("--ks", action="append", type=os.path.abspath,
-                        help="Kickstart file defining the install.")
-    parser.add_argument("--disk", action="append", type=os.path.abspath, dest="disk_paths",
-                        help="Pre-existing disk image to use for destination.")
-
-    parser.add_argument("--proxy",
-                        help="proxy URL to use for the install")
-    parser.add_argument("--location", default=None, type=os.path.abspath,
-                        help="location of iso directory tree with initrd.img "
-                             "and vmlinuz. Used to run virt-install with a "
-                             "newer initrd than the iso.")
-
-    parser.add_argument("--logfile", default="./livemedia.log",
-                        type=os.path.abspath,
-                        help="Path to logfile")
-    parser.add_argument("--tmp", default="/var/tmp", type=os.path.abspath,
-                        help="Top level temporary directory")
-
-    image_group = parser.add_argument_group("disk/fs image arguments")
-    image_group.add_argument("--keep-image", action="store_true",
-                             help="Keep raw disk image after .iso creation")
-
-    # Group of arguments to pass to virt-install
-    virt_group = parser.add_argument_group("virt-install arguments")
-    virt_group.add_argument("--ram", metavar="MEMORY", type=int, default=1024,
-                            help="Memory to allocate for installer in megabytes.")
-    virt_group.add_argument("--vnc",
-                            help="Passed to --graphics command")
-    virt_group.add_argument("--kernel-args",
-                            help="Additional argument to pass to the installation kernel")
-
-    parser.add_argument("--timeout", default=None, type=int,
-                        help="Cancel installer after X minutes")
-
-    opts = parser.parse_args()
-
-    setup_logging(opts.logfile, log)
-
-    log.debug( opts )
-
-    # Check for invalid combinations of options, print all the errors and exit.
-    errors = []
-    if opts.ks and not os.path.exists(opts.ks[0]):
-        errors.append("kickstart file (%s) is missing." % opts.ks[0])
-
-    if opts.iso and not os.path.exists(opts.iso):
-        errors.append("The iso %s is missing." % opts.iso)
-
-    if not opts.iso:
-        errors.append("virt install needs an install iso.")
-
-    if not os.path.exists("/usr/bin/virt-install"):
-        errors.append("virt-install needs to be installed.")
-
-    if os.getuid() != 0:
-        errors.append("You need to run this as root")
-
-    if errors:
-        list(log.error(e) for e in errors)
-        sys.exit(1)
-
-    tempfile.tempdir = opts.tmp
-
-    # Make the image.
-    try:
-        make_image(opts)
-    except InstallError as e:
-        log.error("ERROR: Image creation failed: %s", e)
-        sys.exit(1)
-
-    log.info("SUMMARY")
-    log.info("-------")
-    log.info("Logs are in %s", os.path.abspath(os.path.dirname(opts.logfile)))
-    log.info("Disk image(s) at %s", ",".join(opts.disk_paths))
-    log.info("Results are in %s", opts.tmp)
-
-    sys.exit( 0 )
-
-if __name__ == '__main__':
-    main()
diff --git a/tests/kickstart_tests/scripts/make-addon-pkgs.py b/tests/kickstart_tests/scripts/make-addon-pkgs.py
deleted file mode 100755
index eed4fd7..0000000
--- a/tests/kickstart_tests/scripts/make-addon-pkgs.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/python3
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): David Shea <dshea at redhat.com>
-
-# This script creates all the packages used by nfs-repo-and-addon.ks.
-# The packages are created in two directories, http and nfs. After all the rpms
-# are made just copy everything to the location set in $KSTEST_NFS_ADDON_REPO
-# and the root of the http addon repo server.
-#
-# If a directory argument is given on the command line, the script will change
-# to that directory and create the repos there.
-#
-# This script imports things from tests/lib/mkdud.py, so tests/lib needs to be
-# in $PYTHONPATH.
-
-# Ignore interuptible calls
-# pylint: disable=interruptible-system-call, ignorable-system-call
-
-import os
-from subprocess import check_call
-from mkdud import make_rpm
-import rpmfluff
-import sys
-
-if len(sys.argv) > 1:
-    os.chdir(sys.argv[1])
-
-# Start with http
-os.mkdir('http')
-
-# Everything in this script is super-noisy, which is bad for callers trying
-# to keep a sensible stdout. dup stdout to /dev/null to shut up the parts
-# that break kickstart test prepare(), and leave stderr so we can maybe see
-# what went wrong if something goes wrong
-os.dup2(os.open(os.devnull, os.O_WRONLY), 1)
-
-# Empty package to be added to @core
-pkg = rpmfluff.SimpleRpmBuild('testpkg-http-core', '1.0', '1')
-make_rpm(pkg, 'http')
-
-# Another empty package
-pkg = rpmfluff.SimpleRpmBuild('testpkg-http-addon', '1.0', '1')
-make_rpm(pkg, 'http')
-
-# Three packages with marker files
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share1', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-1/http',
-        rpmfluff.SourceFile('http', ''))
-make_rpm(pkg, 'http')
-
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share2', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-2/http',
-        rpmfluff.SourceFile('http', ''))
-make_rpm(pkg, 'http')
-
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share3', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-3/http',
-        rpmfluff.SourceFile('http', ''))
-make_rpm(pkg, 'http')
-
-# Create a comps file and create the repo
-with open('http/comps.xml', 'wt') as comps:
-    comps.write('''<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-  <group>
-    <id>core</id>
-    <packagelist>
-      <packagereq type="mandatory">testpkg-http-core</packagereq>
-    </packagelist>
-  </group>
-</comps>''')
-
-check_call(['createrepo_c', '-g', 'comps.xml', 'http'])
-
-# Do the same thing again for nfs
-os.mkdir('nfs')
-
-# Empty package to be added to @core
-pkg = rpmfluff.SimpleRpmBuild('testpkg-nfs-core', '1.0', '1')
-make_rpm(pkg, 'nfs')
-
-# Another empty package
-pkg = rpmfluff.SimpleRpmBuild('testpkg-nfs-addon', '1.0', '1')
-make_rpm(pkg, 'nfs')
-
-# Three packages with marker files
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share1', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-1/nfs',
-        rpmfluff.SourceFile('nfs', ''))
-make_rpm(pkg, 'nfs')
-
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share2', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-2/nfs',
-        rpmfluff.SourceFile('nfs', ''))
-make_rpm(pkg, 'nfs')
-
-pkg = rpmfluff.SimpleRpmBuild('testpkg-share3', '1.0', '1')
-pkg.add_installed_file('/usr/share/testpkg-3/nfs',
-        rpmfluff.SourceFile('nfs', ''))
-make_rpm(pkg, 'nfs')
-
-# Create a comps file and create the repo
-with open('nfs/comps.xml', 'wt') as comps:
-    comps.write('''<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
-<comps>
-  <group>
-    <id>core</id>
-    <packagelist>
-      <packagereq type="mandatory">testpkg-nfs-core</packagereq>
-    </packagelist>
-  </group>
-</comps>''')
-
-check_call(['createrepo_c', '-g', 'comps.xml', 'nfs'])
diff --git a/tests/kickstart_tests/scripts/proxy.py b/tests/kickstart_tests/scripts/proxy.py
deleted file mode 100644
index 1ea161e..0000000
--- a/tests/kickstart_tests/scripts/proxy.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/python3
-
-# Start a super-simple proxy server on localhost
-# A list of proxied requests will be saved to /tmp/proxy.log
-
-# Ignore any interruptible calls
-# pylint: disable=interruptible-system-call
-
-from http.server import SimpleHTTPRequestHandler
-import socket
-import select
-import socketserver
-from urllib.request import urlopen
-import os
-from base64 import b64decode
-
-import logging
-log = logging.getLogger("proxy_test")
-log_handler = logging.FileHandler('/tmp/proxy.log')
-log.setLevel(logging.INFO)
-log.addHandler(log_handler)
-
-class ProxyHandler(SimpleHTTPRequestHandler):
-    def send_authenticate(self):
-        self.send_response(407)
-        self.send_header('Proxy-Authenticate', 'Basic realm=proxy-test')
-        self.end_headers()
-
-    def authenticate(self):
-        # If there is no /tmp/proxy.password file, anything goes
-        if not os.path.exists('/tmp/proxy.password'):
-            return True
-
-        # If there is no Authorization header, send a 407, Proxy authentication required
-        authorization = self.headers['Proxy-Authorization']
-        if not authorization:
-            self.send_authenticate()
-            return False
-
-        # Parse the Authorization header. It should be "Basic" followed
-        # user:pass encoded in base64
-        if not authorization.startswith('Basic'):
-            self.send_authenticate()
-            return False
-
-        try:
-            client_auth = b64decode(authorization.split()[1])
-        except IndexError:
-            self.send_authenticate()
-            return False
-
-        with open('/tmp/proxy.password', 'rb') as f:
-            server_auth = f.readline().strip()
-
-        if client_auth != server_auth:
-            self.send_authenticate()
-            return False
-
-        return True
-
-    def do_GET(self):
-        if not self.authenticate():
-            return
-
-        # Log the path then proxy the request via urllib
-        log.info(self.path)
-        data = urlopen(self.path).read()
-        self.send_response(200)
-        self.send_header('Content-Length', str(len(data)))
-        self.end_headers()
-        self.wfile.write(data)
-
-    def do_CONNECT(self):
-        if not self.authenticate():
-            return
-
-        # In this case self.path is just a host:port pair instead
-        # of a URL.
-        host, port = self.path.split(':')
-
-        # Open a socket to the requested location
-        target = socket.create_connection((host, port))
-
-        # Report that the connection is established
-        self.send_response(200)
-        self.end_headers()
-
-        # Forward data in either direction as it comes in, until
-        # someone closes the connection
-        host_fd = self.rfile.fileno()
-        target_fd = target.fileno()
-        bufsize = 1024
-        check_fds = [host_fd, target_fd]
-
-        while True:
-            readfds, _writefds, xfds = select.select(check_fds, [], check_fds)
-            if xfds:
-                break
-
-            if host_fd in readfds:
-                buf = os.read(host_fd, bufsize)
-                if not buf:
-                    break
-
-                target.send(buf)
-
-            if target_fd in readfds:
-                buf = os.read(target_fd, bufsize)
-                if not buf:
-                    break
-
-                self.wfile.write(buf)
-
-        target.close()
-
-class ProxyServer(socketserver.TCPServer):
-    allow_reuse_address = True
-
-    def __init__(self):
-        socketserver.TCPServer.__init__(self, ('', 8080), ProxyHandler)
-
-ProxyServer().serve_forever()
diff --git a/tests/kickstart_tests/scripts/run_kickstart_tests.sh b/tests/kickstart_tests/scripts/run_kickstart_tests.sh
deleted file mode 100755
index aa52acb..0000000
--- a/tests/kickstart_tests/scripts/run_kickstart_tests.sh
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2014, 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-# This script runs the entire kickstart_tests suite.  It is an interface
-# between "make check" (which is why it takes environment variables instead
-# of arguments) and livemedia-creator.  Each test consists of a kickstart
-# file that specifies most everything about the installation, and a shell
-# script that does validation and specifies kernel boot parameters.  lmc
-# then fires up a VM and watches for tracebacks or stuck installs.
-#
-# A boot ISO is required, which should be specified with TEST_BOOT_ISO=.
-#
-# The number of jobs corresponds to the number of VMs that will be started
-# simultaneously.  Each one wants about 2 GB of memory.  The default is
-# two simultaneous jobs, but you can control this with TEST_JOBS=.  It is
-# suggested you not run out of memory.
-#
-# You can control what logs are held onto after the test is complete via the
-# KEEPIT= variable, explained below.  By default, nothing is kept.
-#
-# Finally, you can run tests across multiple computers at the same time by
-# putting all the hostnames into TEST_REMOTES= as a space separated list.
-# Do not add localhost manually, as it will always be added for you.  You
-# must create a user named kstest on each remote system, allow that user to
-# sudo to root for purposes of running livemedia-creator, and have ssh keys
-# set up so that the user running this script can login to the remote systems
-# as kstest without a password.  TEST_JOBS= applies on a per-system basis.
-# KEEPIT= controls how much will be kept on the master system (where "make
-# check" is run).  All results will be removed from the slave systems.
-
-# The boot.iso location can come from one of two different places:
-# (1) $TEST_BOOT_ISO, if this script is being called from "make check"
-# (2) The command line, if this script is being called directly.  That will
-#     be checked below.
-IMAGE="${TEST_BOOT_ISO}"
-
-# Possible values for this parameter:
-# 0 - Keep nothing (the default)
-# 1 - Keep log files
-# 2 - Keep log files and disk images (will take up a lot of space)
-KEEPIT=${KEEPIT:-0}
-
-TESTTYPE=""
-
-while getopts ":i:k:t:" opt; do
-    case $opt in
-       i)
-           # If this wasn't set from the environment, set it from the command line
-           # here.  If it never gets set, we'll catch that later and error out.
-           IMAGE=$OPTARG
-           ;;
-
-       k)
-           # This overrides either the $KEEPIT environment variable, or the default
-           # setting from above.
-           KEEPIT=$OPTARG
-           ;;
-
-       t)
-           # Only run tests that have TESTTYPE=<this value> in them.  Tests can have
-           # more than one type.  We'll do a pretty stupid test for it.
-           TESTTYPE=$OPTARG
-           ;;
-
-       *)
-           echo "Usage: run_kickstart_tests.sh [-i boot.iso] [-k 0|1|2] [tests]"
-           exit 1
-           ;;
-    esac
-done
-
-if [[ ! -e "${IMAGE}" ]]; then
-    echo "Required boot.iso does not exist; skipping."
-    exit 77
-fi
-
-shift $((OPTIND - 1))
-
-# Get default settings from a couple different places - under the source
-# directory for settings that are potentially useful to everyone, and then
-# in the user's home directory for settings that are site-specific and thus
-# can't be put into source control.
-if [[ -e kickstart_tests/scripts/defaults.sh ]]; then
-    . kickstart_tests/scripts/defaults.sh
-fi
-
-if [[ -e $HOME/.kstests.defaults.sh ]]; then
-    . $HOME/.kstests.defaults.sh
-fi
-
-# Build up a list of substitutions to perform on kickstart files.
-sed_args=$(printenv | while read line; do
-    key="$(echo $line | cut -d'=' -f1)"
-    val="$(echo $line | cut -d'=' -f2-)"
-
-    [[ "${key}" =~ ^KSTEST_ ]] && echo -n " -e s#@${key}@#${val}#"
- done)
-
-# We get the list of tests from one of two places:
-# (1) From the command line, all the other arguments.
-# (2) By applying any TESTTYPE given on the command line.
-# (3) From finding all scripts in kickstart_tests/ that are executable and are
-#     not support files.
-if [[ $# != 0 ]]; then
-    tests="$*"
-else
-    tests=$(find kickstart_tests -maxdepth 1 -name '*sh' -a -perm -o+x)
-
-    newtests=""
-    for f in ${tests}; do
-        if [[ "$TESTTYPE" != "" && "$(grep TESTTYPE= ${f})" =~ "${TESTTYPE}" ]]; then
-            newtests+="${f} "
-        elif [[ "$TESTTYPE" == "" && ! "$(grep TESTTYPE= ${f})" =~ knownfailure ]]; then
-            # Skip any test with the type "knownfailure".  If you want to run these (to
-            # see if they are still failing, for instance) you can add "-t knownfailure"
-            # on the command line.
-            newtests+="${f} "
-        else
-            continue
-        fi
-    done
-
-    tests="${newtests}"
-fi
-
-if [[ "${tests}" == "" ]]; then
-    echo "No tests provided; skipping."
-    exit 77
-fi
-
-if [[ -z "${sed_args}" ]]; then
-    echo "No substitutions provided, tests will fail; skipping."
-    exit 77
-fi
-
-export KSTESTDIR=${PWD}/kickstart_tests
-
-# Now do all the substitutions on the kickstart files matching up with one of
-# the test cases we are going to run.
-for t in ${tests}; do
-    ks=${t/.sh/.ks.in}
-    sed ${sed_args} ${ks} > ${t/.sh/.ks}
-done
-
-# collect the prerequisite list for the requested tests. If there is
-# anything in the list, build it.
-
-# Run the prereq functions in a subshell so nothing weird gets into the
-# environment just yet. Print each item one per line and remove duplicates.
-prereq_list=$(
-for t in ${tests} ; do
-    . ${t}
-    for p in $(prereqs) ; do
-        echo $p
-    done
-done | sort | uniq)
-
-if [ -n "$prereq_list" ] ; then
-    make IMAGE="${IMAGE}" KSTESTDIR="${KSTESTDIR}" \
-        -C kickstart_tests/scripts -f Makefile.prereqs $prereq_list
-fi
-
-if [[ "$TEST_REMOTES" != "" ]]; then
-    _IMAGE=kickstart_tests/$(basename ${IMAGE})
-
-    # (1) Copy everything to the remote systems.  We do this ourselves because
-    # parallel doesn't like globs, and we need to put the boot image somewhere
-    # that qemu on the remote systems can read.
-    for remote in ${TEST_REMOTES}; do
-        scp -r kickstart_tests kstest@${remote}:
-        scp ${IMAGE} kstest@${remote}:kickstart_tests/
-    done
-
-    # (1a) We also need to copy the provided image to under kickstart_tests/ on
-    # the local system too.  This is because parallel will attempt to run the
-    # same command line on every system and that requires the image to also be
-    # in the same location.
-    cp ${IMAGE} ${_IMAGE}
-
-    # (2) Run parallel.  We always add the local system to the list of machines
-    # being passed to parallel.  Don't add it yourself.
-    remote_args="--sshlogin :"
-    for remote in ${TEST_REMOTES}; do
-        remote_args="${remote_args} --sshlogin kstest@${remote}"
-    done
-
-    parallel --no-notice ${remote_args} --jobs ${TEST_JOBS:-2} \
-             sudo PYTHONPATH=$PYTHONPATH kickstart_tests/scripts/run_one_ks.sh -i ${_IMAGE} -k ${KEEPIT} {} ::: ${tests}
-    rc=$?
-
-    # (3) Get all the results back from the remote systems, which will have already
-    # applied the KEEPIT setting.  However if KEEPIT is 0 (meaning, don't save
-    # anything) there's no point in trying.  We do this ourselves because, again,
-    # parallel doesn't like globs.
-    #
-    # We also need to clean up the stuff we copied over in step 1, and then clean up
-    # the results from the remotes too.  We don't want to keep things scattered all
-    # over the place.
-    for remote in ${TEST_REMOTES}; do
-        if [[ ${KEEPIT} > 0 ]]; then
-            scp -r kstest@${remote}:/var/tmp/kstest-\* /var/tmp/
-        fi
-
-        ssh kstest@${remote} sudo rm -rf kickstart_tests /var/tmp/kstest-\*
-    done
-
-    # (3a) And then also remove the copy of the image we made earlier.
-    rm ${_IMAGE}
-
-    # (4) Exit the subshell defined by "find ... | " way up at the top.  The exit
-    # code will be caught outside and converted into the overall exit code.
-    exit ${rc}
-else
-    parallel --no-notice --jobs ${TEST_JOBS:-2} \
-        sudo PYTHONPATH=$PYTHONPATH kickstart_tests/scripts/run_one_ks.sh -i ${IMAGE} -k ${KEEPIT} {} ::: ${tests}
-
-    # For future expansion - any cleanup code can go in between the variable
-    # setting and the exit, like in the other branch of the if-else above.
-    rc=$?
-    exit ${rc}
-fi
-
-# Catch the exit code of the subshell and return it.  This is structured for
-# future expansion, too.  Any extra global cleanup code can go in between the
-# variable setting and the exit.
-rc=$?
-exit ${rc}
diff --git a/tests/kickstart_tests/scripts/run_one_ks.sh b/tests/kickstart_tests/scripts/run_one_ks.sh
deleted file mode 100755
index a6278e6..0000000
--- a/tests/kickstart_tests/scripts/run_one_ks.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-# This script runs a single kickstart test on a single system.  It takes
-# command line arguments instead of environment variables because it is
-# designed to be driven by run_kickstart_tests.sh via parallel.  It is
-# not for direct use.
-
-# Possible return values:
-# 0  - Everything worked
-# 1  - Test failed for unspecified reasons
-# 2  - Test failed due to time out
-# 3  - Test failed due to kernel panic
-# 77 - Something needed by the test doesn't exist, so skip
-
-IMAGE=
-KEEPIT=0
-
-cleanup_tmp() {
-    d=$1
-
-    # Always remove the copy of the boot.iso.
-    rm ${d}/$(basename ${IMAGE})
-
-    if [[ ${KEEPIT} == 2 ]]; then
-        return
-    elif [[ ${KEEPIT} == 1 ]]; then
-        rm -f ${d}/disk-*.img ${d}/*ks
-    elif [[ ${KEEPIT} == 0 ]]; then
-        rm -rf ${d}
-    fi
-}
-
-runone() {
-    t=$1
-
-    export KSTESTDIR=$(pwd)/kickstart_tests
-
-    ks=${t/.sh/.ks}
-    . $t
-
-    name=$(basename ${t%.sh})
-
-    echo
-    echo ===========================================================================
-    echo ${ks} on $(hostname)
-    echo ===========================================================================
-
-    # qemu user needs to be able to read the directory and the boot.iso, so put that
-    # into this directory as well.  It will get deleted later, regardless of the
-    # KEEPIT setting.
-    tmpdir=$(mktemp -d --tmpdir=/var/tmp kstest-${name}.XXXXXXXX)
-    chmod 755 ${tmpdir}
-    cp ${IMAGE} ${tmpdir}
-
-    ksfile=$(prepare ${ks} ${tmpdir})
-    if [[ $? != 0 ]]; then
-        echo RESULT:${name}:FAILED:Test prep failed: ${ksfile}
-        cleanup ${tmpdir}
-        cleanup_tmp ${tmpdir}
-        return 99
-    fi
-
-    # Check that the prepared kickstart is free of substitution markers. Normally
-    # the substitutions are run by run_kickstart_tests.sh, but prepare has a chance
-    # to run them too. If both of those left any @STUFF@ strings behind, fail.
-    unmatched="$(grep -o '@[^[:space:]]\+@' ${ksfile} | head -1)"
-    if [ -n "$unmatched" ]; then
-        echo "RESULT:${name}:FAILED:Unsubstituted pattern ${unmatched}"
-        cleanup ${tmpdir}
-        cleanup_tmp ${tmpdir}
-        return 99
-    fi
-
-
-    kargs=$(kernel_args)
-    if [[ "${kargs}" != "" ]]; then
-        kargs="--kernel-args \"$kargs\""
-    fi
-
-    disks=$(prepare_disks ${tmpdir})
-    disk_args=$(for d in $disks; do echo --disk $d,cache=unsafe; done)
-
-    echo "PYTHONPATH=$PYTHONPATH"
-    eval ${KSTESTDIR}/scripts/kstest-runner ${kargs} \
-                       --iso "${tmpdir}/$(basename ${IMAGE})" \
-                       --ks ${ksfile} \
-                       --tmp ${tmpdir} \
-                       --logfile ${tmpdir}/livemedia.log \
-                       --ram 2048 \
-                       --vnc vnc \
-                       --timeout 60 \
-                       ${disk_args}
-    if [[ -f ${tmpdir}/virt-install.log && "$(grep CRIT ${tmpdir}/virt-install.log)" != "" ]]; then
-        echo RESULT:${name}:FAILED:$(grep CRIT ${tmpdir}/virt-install.log)
-        cleanup ${tmpdir}
-        cleanup_tmp ${tmpdir}
-        return 1
-    elif [[ -f ${tmpdir}/livemedia.log ]]; then
-        if [[ "$(grep 'due to timeout' ${tmpdir}/livemedia.log)" != "" ]]; then
-            echo RESULT:${name}:FAILED:Test timed out.
-            cleanup ${tmpdir}
-            cleanup_tmp ${tmpdir}
-            return 2
-        elif [[ "$(grep 'Call Trace' ${tmpdir}/livemedia.log)" != "" ]]; then
-            echo RESULT:${name}:FAILED:Kernel panic.
-            cleanup ${tmpdir}
-            cleanup_tmp ${tmpdir}
-            return 3
-        fi
-
-        result=$(validate ${tmpdir})
-        if [[ $? != 0 ]]; then
-            echo RESULT:${name}:FAILED:"${result}"
-            cleanup ${tmpdir}
-            cleanup_tmp ${tmpdir}
-            return 1
-        fi
-    fi
-
-    echo RESULT:${name}:SUCCESS
-    cleanup ${tmpdir}
-    cleanup_tmp ${tmpdir}
-    return 0
-}
-
-# Have to be root to run this test, as it requires creating disk images.
-if [[ ${EUID} != 0 ]]; then
-    echo "You must be root to run this test."
-    exit 77
-fi
-
-while getopts ":i:k:" opt; do
-    case $opt in
-        i)
-            IMAGE=$OPTARG
-            ;;
-
-        k)
-            KEEPIT=$OPTARG
-            ;;
-
-        *)
-            echo "Usage: run_one_ks.sh -i ISO [-k KEEPIT] ks-test.sh"
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND - 1))
-
-if [[ ! -e "${IMAGE}" ]]; then
-    echo "Required boot.iso does not exist."
-    exit 77
-fi
-
-if [[ $# == 0 || ! -x $1 ]]; then
-    echo "Test not provided or is not executable."
-    exit 1
-fi
-
-runone $1
diff --git a/tests/kickstart_tests/scripts/run_report.sh b/tests/kickstart_tests/scripts/run_report.sh
deleted file mode 100755
index b62b128..0000000
--- a/tests/kickstart_tests/scripts/run_report.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/gawk -f
-
-BEGIN {
-    printf("\n\n\n%-30s | %-10s | %s\n", "TEST", "RESULT", "EXPLANATION");
-    printf("-------------------------------+------------+--------------------------------------------------------\n");
-    FS=":"
-}
-/^RESULT:/ { if ($4 == "Test timed out.") {
-                 result = "TIMED OUT";
-                 explanation = "";
-             } else if (match($0, "Traceback")) {
-                 result = "FAILED";
-                 explanation = "Traceback";
-             } else if (match($0, "SUCCESS")) {
-                 result = $3;
-                 explanation = "";
-             } else {
-                 result = $3;
-                 explanation = substr($0, index($0, $4), 55);
-             }
-
-             printf("%-30s | %-10s | %s\n", $2, result, explanation);
-           }
-END {
-    printf("\n\n");
-}
diff --git a/tests/kickstart_tests/selinux-disabled.ks.in b/tests/kickstart_tests/selinux-disabled.ks.in
deleted file mode 100644
index 01cd3ea..0000000
--- a/tests/kickstart_tests/selinux-disabled.ks.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard --vckeymap cz --xlayouts=cz
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-
-# SeLinux test
-selinux --disabled
-
-shutdown
-
-%packages
-%end
-
-%post
-
-# Test disabled
-cat /etc/selinux/config | grep SELINUX=disabled
-if [[ $? -ne 0 ]]; then
-    echo "*** SELinux not disabled" >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/selinux-disabled.sh b/tests/kickstart_tests/selinux-disabled.sh
deleted file mode 100755
index 533cf04..0000000
--- a/tests/kickstart_tests/selinux-disabled.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="selinux"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/selinux-enforcing.ks.in b/tests/kickstart_tests/selinux-enforcing.ks.in
deleted file mode 100644
index 9cf516f..0000000
--- a/tests/kickstart_tests/selinux-enforcing.ks.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard --vckeymap cz --xlayouts=cz
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-
-# SeLinux test
-selinux --enforcing
-
-shutdown
-
-%packages
-%end
-
-%post
-
-# Test enforcing
-cat /etc/selinux/config | grep SELINUX=enforcing
-if [[ $? -ne 0 ]]; then
-    echo "*** SELinux not in enforcing mode" >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/selinux-enforcing.sh b/tests/kickstart_tests/selinux-enforcing.sh
deleted file mode 100755
index 533cf04..0000000
--- a/tests/kickstart_tests/selinux-enforcing.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="selinux"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/selinux-permissive.ks.in b/tests/kickstart_tests/selinux-permissive.ks.in
deleted file mode 100644
index 2fd6368..0000000
--- a/tests/kickstart_tests/selinux-permissive.ks.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard --vckeymap cz --xlayouts=cz
-lang cs_CZ.UTF-8
-timezone America/New_York --utc
-rootpw testcase
-
-# SeLinux test
-selinux --permissive
-
-shutdown
-
-%packages
-%end
-
-%post
-
-# Test permissive
-cat /etc/selinux/config | grep SELINUX=permissive
-if [[ $? -ne 0 ]]; then
-    echo "*** SELinux not in permissive mode" >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/selinux-permissive.sh b/tests/kickstart_tests/selinux-permissive.sh
deleted file mode 100755
index 533cf04..0000000
--- a/tests/kickstart_tests/selinux-permissive.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="selinux"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/services.ks.in b/tests/kickstart_tests/services.ks.in
deleted file mode 100644
index 607187f..0000000
--- a/tests/kickstart_tests/services.ks.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard en
-lang en
-timezone America/New_York --utc
-rootpw testcase
-
-# Test services
-services --disabled=sshd --enabled=systemd-timesyncd
-
-# Test SELinux
-selinux --enforcing
-
-shutdown
-
-%packages
-%end
-
-%post
-
-# Test enabled
-systemctl is-enabled systemd-timesyncd
-if [[ $? -ne 0 ]]; then
-    echo "*** systemd-timesyncd is disabled, not enabled" >> /root/RESULT
-fi
-
-# Test disabled
-systemctl is-enabled sshd
-if [[ $? -eq 0 ]]; then
-    echo "*** sshd is enabled, not disabled" >> /root/RESULT
-fi
-
-# Test disabled - W/out change
-systemctl is-enabled systemd-networkd
-if [[ $? -eq 0 ]]; then
-    echo "*** systemd-networkd is enabled, should be disabled" >> /root/RESULT
-fi
-
-# SELinux test
-grep 'SELINUX=enforcing' /etc/selinux/config
-if [[ $? -ne 0 ]]; then
-    echo "*** SELinux not in enforcing mode" >> /root/RESULT
-fi
-
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/services.sh b/tests/kickstart_tests/services.sh
deleted file mode 100755
index 47b1db7..0000000
--- a/tests/kickstart_tests/services.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="services"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/timezoneLOCAL.ks.in b/tests/kickstart_tests/timezoneLOCAL.ks.in
deleted file mode 100644
index 2f376b7..0000000
--- a/tests/kickstart_tests/timezoneLOCAL.ks.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard en
-lang en
-timezone Europe/Prague
-rootpw testcase
-
-shutdown
-
-%packages
-%end
-
-%post
-## UTC ZONE TEST
-# hwclock LOCAL test
-hwclock -D | grep "Assuming hardware clock is kept in local time."
-if [[ $? -ne 0 ]]; then
-    echo "*** hwclock not set to LOCAL time." >> /root/RESULT
-fi
-
-# cat adjtime LOCAL test
-cat /etc/adjtime | grep LOCAL
-if [[ $? -ne 0 ]]; then
-    echo "*** Time in /etc/adjtime is not set to LOCAL." >> /root/RESULT
-fi
-
-# everything passes
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/timezoneLOCAL.sh b/tests/kickstart_tests/timezoneLOCAL.sh
deleted file mode 100755
index b3f16c1..0000000
--- a/tests/kickstart_tests/timezoneLOCAL.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="time"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/timezoneUTC.ks.in b/tests/kickstart_tests/timezoneUTC.ks.in
deleted file mode 100644
index bc70377..0000000
--- a/tests/kickstart_tests/timezoneUTC.ks.in
+++ /dev/null
@@ -1,39 +0,0 @@
-#version=DEVEL
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all --initlabel
-autopart
-
-keyboard en
-lang en
-timezone Europe/Prague --utc
-rootpw testcase
-
-shutdown
-
-%packages
-%end
-
-%post
-## UTC ZONE TEST
-# hwclock -D UTC test
-hwclock -D | grep "Assuming hardware clock is kept in UTC time."
-if [[ $? -ne 0 ]]; then
-    echo "*** hwclock not set to UTC.." >> /root/RESULT
-fi
-
-# cat adjtime UTC test
-cat /etc/adjtime | grep UTC
-if [[ $? -ne 0 ]]; then
-    echo "*** Time in /etc/adjtime not set to UTC." >> /root/RESULT
-fi
-
-# everything passes
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/timezoneUTC.sh b/tests/kickstart_tests/timezoneUTC.sh
deleted file mode 100755
index b3f16c1..0000000
--- a/tests/kickstart_tests/timezoneUTC.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="time"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/tmpfs-fixed_size.ks.in b/tests/kickstart_tests/tmpfs-fixed_size.ks.in
deleted file mode 100644
index 492772c..0000000
--- a/tests/kickstart_tests/tmpfs-fixed_size.ks.in
+++ /dev/null
@@ -1,49 +0,0 @@
-url @KSTEST_URL@
-install
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-
-part --fstype=ext4 --size=4400 --label=rootfs /
-part --fstype=ext4 --size=500 /boot
-part --fstype=swap --size=500 swap
-part --fstype=tmpfs --size 5000 /tmp
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
- at core
-%end
-
-%post
-mount | grep -q "tmpfs on /tmp"
-if [[ $? != 0 ]]; then
-    echo '*** tmpfs not mounted in /tmp' >> /root/RESULT
-fi
-
-mount | grep "tmpfs on /tmp" | grep -q "size=5120000k"
-if [[ $? != 0 ]]; then
-    echo '*** tmpfs size is not 5000 MB' >> /root/RESULT
-fi
-
-cat /etc/fstab | grep -q "tmpfs"
-if [[ $? != 0 ]]; then
-    echo '*** tmpfs is not present in fstab' >> /root/RESULT
-fi
-
-cat /etc/fstab | grep "tmpfs" | grep -q "size=5000m"
-if [[ $? != 0 ]]; then
-    echo '*** tmpfs size is not 5000 MB in fstab' >> /root/RESULT
-fi
-
-# the installation was successfull if nothing bad happend till now
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/tmpfs-fixed_size.sh b/tests/kickstart_tests/tmpfs-fixed_size.sh
deleted file mode 100755
index b3bc1b4..0000000
--- a/tests/kickstart_tests/tmpfs-fixed_size.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2014  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="storage"
-
-. ${KSTESTDIR}/functions.sh
-
-validate() {
-    disksdir=$1
-    args=$(for d in ${disksdir}/disk-*img; do echo -a ${d}; done)
-
-    # Grab the coverage results out of the installed system while it still
-    # exists.
-    virt-copy-out ${args} /root/anaconda.coverage ${disksdir}
-
-    # There should be a /root/RESULT file with results in it.  Check
-    # its contents and decide whether the test finally succeeded or
-    # not.
-    result=$(virt-cat ${args} -m /dev/disk/by-label/rootfs /root/RESULT)
-    if [[ $? != 0 ]]; then
-        status=1
-        echo '*** /root/RESULT does not exist in VM image.'
-    elif [[ "${result}" != "SUCCESS" ]]; then
-        status=1
-        echo "${result}"
-    fi
-
-    return ${status}
-}
diff --git a/tests/kickstart_tests/user.ks.in b/tests/kickstart_tests/user.ks.in
deleted file mode 100644
index e564ffa..0000000
--- a/tests/kickstart_tests/user.ks.in
+++ /dev/null
@@ -1,117 +0,0 @@
-url @KSTEST_URL@
-
-install
-
-network --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-
-rootpw qweqwe
-
-## TEST CREATE USER
-# Create specific user group
-group --name=kosygroup --gid=5001
-
-# Create specific user
-user --name=kosieh --gecos="Kosieh Barter ☃" --homedir=/home/kbarter --password="$6$QsJCB9E6geIjWNvn$UZLEtnHYgKmFgrPo0fY1qNBc/aRi9b01f19w9mpdFm9.MPblckUuFYvpRLSzeYeR/6lO/2uY4WtjhbryC0k2L/" --iscrypted --shell=/bin/bash --uid=4001 --gid=5001 --groups=wheel,users
-
-# Give that user a (bogus) ssh key.
-sshkey --username=kosieh "this is a bogus ssh key"
-
-shutdown
-
-%packages
-%end
-
-%post
-
-## TEST CREATE USER CHECK
-# Check group
-grep 5001 /etc/group
-if [[ $? -ne 0 ]]; then
-    echo "*** Group failed to create." >> /root/RESULT
-fi
-
-# Check group name
-grep kosygroup /etc/group
-if [[ $? -ne 0 ]]; then
-    echo "*** Group name not present." >> /root/RESULT
-fi
-
-# Check find username
-grep kosieh /etc/passwd
-if [[ $? -ne 0 ]]; then
-    echo "*** User is not present in system." >> /root/RESULT
-fi
-
-# Check GECOS: real name
-# Also check that the unicode made it through ok. The escape sequences are
-# U+2603 encoded as UTF-8, which is lovingly hand-encoded here instead of
-# just using the character to make sure the character didn't just get mangled
-# the same way twice.
-grep kosieh /etc/passwd | grep "Kosieh Barter $(echo -ne '\xe2\x98\x83')"
-if [[ $? -ne 0 ]]; then
-    echo "*** User is present, but not all details: REAL NAME (GEDOS)" >> /root/RESULT
-fi
-
-# Check if the user has his/her bash
-grep kosieh /etc/passwd | grep "/bin/bash"
-if [[ $? -ne 0 ]]; then
-    echo "*** User is present, but /bin/bash is not set" >> /root/RESULT
-fi
-
-# Check if the user has encrypted password
-grep kosieh /etc/shadow | grep "$6$QsJCB9E6geIjWNvn$UZLEtnHYgKmFgrPo0fY1qNBc/aRi9b01f19w9mpdFm9.MPblckUuFYvpRLSzeYeR/6lO/2uY4WtjhbryC0k2L/"
-if [[ $? -ne 0 ]]; then
-    echo "*** User is present, passwords DO NOT match" >> /root/RESULT
-fi
-
-# Check if the user is in correct group
-grep kosieh /etc/passwd | grep 5001
-if [[ $? -ne 0 ]]; then
-    echo "*** User is present, group assignment" >> /root/RESULT
-fi
-
-# Check if the user has PHYSICAL home dir
-if [[ ! -d /home/kbarter ]]; then
-    echo "*** Home directory not found" >> /root/RESULT
-fi
-
-# Check for home dir in /etc/passwd
-grep /home/kbarter /etc/passwd
-if [[ $? -ne 0 ]]; then
-    echo "*** Home directory not in passwd file" >> /root/RESULT
-fi
-
-# Check that an ssh key was added.
-if [[ ! -f /home/kbarter/.ssh/authorized_keys ]]; then
-    echo "*** .authorized_keys not created" >> /root/RESULT
-fi
-
-perms="$(stat --format='%u %g %a' /home/kbarter/.ssh)"
-if [[ "${perms}" != "4001 5001 700" ]]; then
-    echo "*** /home/kbarter/.ssh does not have the right permissions; got " ${perms} >> /root/RESULT
-fi
-
-perms="$(stat --format='%u %g %a' /home/kbarter/.ssh/authorized_keys)"
-if [[ "${perms}" != "4001 5001 600" ]]; then
-    echo "*** /home/kbarter/.ssh/authorized_keys does not have the right permissions; got " ${perms} >> /root/RESULT
-fi
-
-if [[ "$(cat /home/kbarter/.ssh/authorized_keys)" != "this is a bogus ssh key" ]]; then
-    echo "*** .authorized_keys doesn't have the right contents" >> /root/RESULT
-fi
-
-# Final check
-if [[ ! -e /root/RESULT ]]; then
-    echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/user.sh b/tests/kickstart_tests/user.sh
deleted file mode 100755
index ca6a124..0000000
--- a/tests/kickstart_tests/user.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="users"
-
-. ${KSTESTDIR}/functions.sh
diff --git a/tests/kickstart_tests/vlan.ks.in b/tests/kickstart_tests/vlan.ks.in
deleted file mode 100644
index 9343191..0000000
--- a/tests/kickstart_tests/vlan.ks.in
+++ /dev/null
@@ -1,57 +0,0 @@
-url @KSTEST_URL@
-install
-network --device=link --bootproto=dhcp
-# Create testing vlan interface
-network --device=link --vlanid=150 --bootproto=dhcp
-
-bootloader --timeout=1
-zerombr
-clearpart --all
-autopart
-
-keyboard us
-lang en
-timezone America/New_York
-rootpw qweqwe
-shutdown
-
-%packages
-%end
-
-%post
-IF_FILE=$(ls /etc/sysconfig/network-scripts/*.150)
-DEVICE=$(sed 's/.*-//g' <<< "$IF_FILE")
-
-if [[ -e $IF_FILE ]]; then
-   cp $IF_FILE /root/
-   echo "$DEVICE" >> /root/device
-else
-   echo '*** ifcfg file for vlan missing' >> /root/RESULT
-   exit 0
-fi
-
-grep -q '^TYPE=Vlan$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** TYPE=Vlan is not present' >> /root/RESULT
-fi
-
-grep -q '^BOOTPROTO=dhcp$' $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** BOOTPROTO is not present' >> /root/RESULT
-fi
-
-grep -q "^NAME=${DEVICE}$" $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** NAME is not present' >> /root/RESULT
-fi
-
-grep -q "^DEVICE=${DEVICE}$" $IF_FILE
-if [[ $? -ne 0 ]]; then
-   echo '*** DEVICE is not present' >> /root/RESULT
-fi
-
-# No error was written to /root/RESULT file, everything is OK
-if [[ ! -e /root/RESULT ]]; then
-   echo SUCCESS > /root/RESULT
-fi
-%end
diff --git a/tests/kickstart_tests/vlan.sh b/tests/kickstart_tests/vlan.sh
deleted file mode 100755
index 0c97d62..0000000
--- a/tests/kickstart_tests/vlan.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2015  Red Hat, Inc.
-#
-# This copyrighted material is made available to anyone wishing to use,
-# modify, copy, or redistribute it subject to the terms and conditions of
-# the GNU General Public License v.2, or (at your option) any later version.
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY expressed or implied, including the implied warranties of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
-# Public License for more details.  You should have received a copy of the
-# GNU General Public License along with this program; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.  Any Red Hat trademarks that are incorporated in the
-# source code or documentation are not subject to the GNU General Public
-# License and may only be used or replicated with the express permission of
-# Red Hat, Inc.
-#
-# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
-
-TESTTYPE="network"
-
-. ${KSTESTDIR}/functions.sh
-- 
2.4.3



More information about the anaconda-patches mailing list