cherry-pick trunk rev 4025plainbox-provider-checkbox-v0.22

12 files changed, 443 insertions, 465 deletions

diff --git a/units/autotesting.pxu b/units/autotesting.pxu
new file mode 100644
index 0000000..c2d64e1
--- /dev/null
+++ b/units/autotesting.pxu
@@ -0,0 +1,113 @@
+id: autotesting
+_name: Automated Tests
+unit: test plan
+description:
+ This test plan is used for automated testing of the test cases themselves.
+ The resources jobs are needed for a valid submission, so they are included
+ explicitly, even if they are usually run implicitly by jobs requiring them.
+include:
+ IEEE_80211
+ cpuinfo
+ dpkg
+ lsb
+ package
+ uname
+ acpi_sleep_attachment
+ codecs_attachment
+ cpuinfo_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ efi_attachment
+ lspci_attachment
+ lspci_standard_config_attachment
+ meminfo_attachment
+ modinfo_attachment
+ modprobe_attachment
+ modules_attachment
+ sysctl_attachment
+ sysfs_attachment
+ udev_attachment
+ recovery_info_attachment
+ dell_bto_xml_attachment
+ lsmod_attachment
+ dkms_info_attachment
+ audio/alsa_record_playback_automated
+ bluetooth/detect-output
+ camera/detect
+ camera/multiple-resolution-images
+ cpu/scaling_test
+ cpu/scaling_test-log-attach
+ cpu/offlining_test
+ cpu/topology
+ disk/read_performance
+ disk/read_performance_.*
+ graphics/xorg-version
+ graphics/1_compiz_check_.*
+ graphics/xorg-failsafe
+ graphics/xorg-process
+ graphics/1_screenshot_.*
+ 1_screenshot_.*.jpg
+ graphics/1_screenshot_fullscreen_video_.*
+ 1_screenshot_fullscreen_video_.*.jpg
+ install/apt-get-gets-updates
+ mediacard/sd-preinserted
+ memory/info
+ memory/check
+ miscellanea/submission-resources
+ miscellanea/fwts_test
+ miscellanea/fwts_results.log
+ ethernet/detect
+ networking/http
+ networking/gateway_ping
+ power-management/tickless_idle
+ power-management/rtc
+ power-management/fwts_wakealarm
+ power-management/fwts_wakealarm-log-attach
+ usb/detect
+ usb/storage-preinserted
+ wireless/wireless_scanning
+ wireless/wireless_connection_wpa_bg
+ wireless/wireless_connection_open_bg
+ wireless/wireless_connection_wpa_n
+ wireless/wireless_connection_open_n
+ wireless/wireless_connection_wpa_ac
+ wireless/wireless_connection_open_ac
+ wireless/monitor_wireless_connection_udp
+ suspend/audio_before_suspend
+ suspend/bluetooth_obex_send_before_suspend
+ suspend/bluetooth_obex_browse_before_suspend
+ suspend/bluetooth_obex_get_before_suspend
+ suspend/cpu_before_suspend
+ suspend/network_before_suspend
+ suspend/memory_before_suspend
+ suspend/suspend_advanced_auto
+ suspend/suspend-single-log-check
+ suspend/audio_after_suspend_auto
+ suspend/network_resume_time_auto
+ suspend/wifi_resume_time_auto
+ suspend/usb_storage_preinserted_after_suspend
+ suspend/record_playback_after_suspend_auto
+ suspend/bluetooth_obex_send_after_suspend_auto
+ suspend/bluetooth_obex_browse_after_suspend_auto
+ suspend/bluetooth_obex_get_after_suspend_auto
+ suspend/cpu_after_suspend_auto
+ suspend/memory_after_suspend_auto
+ suspend/wireless_connection_after_suspend_wpa_bg_auto
+ suspend/wireless_connection_after_suspend_open_bg_auto
+ suspend/wireless_connection_after_suspend_wpa_n_auto
+ suspend/wireless_connection_after_suspend_open_n_auto
+ suspend/wireless_connection_after_suspend_wpa_ac_auto
+ suspend/wireless_connection_after_suspend_open_ac_auto
+ suspend/gpu_lockup_after_suspend
+ suspend/screenshot_after_suspend
+ screenshot_after_suspend.jpg
+bootstrap_include:
+ disk/read_performance
+ graphics/generator_compiz_check
+ graphics/generator_screenshot
+ graphics/generator_screenshot.jpg
+ graphics/generator_screenshot_fullscreen_video
+ graphics/generator_screenshot_fullscreen_video.jpg
+ graphics/generator_screenshot_fullscreen_video
+ graphics/generator_screenshot_fullscreen_video.jpg
diff --git a/units/default.pxu b/units/default.pxu
new file mode 100644
index 0000000..7b47f99
--- /dev/null
+++ b/units/default.pxu
@@ -0,0 +1,114 @@
+id: default
+_name: Default Tests
+unit: test plan
+include:
+ optical_drive
+ miscellanea/submission-resources
+ miscellanea/is_laptop
+ codecs_attachment
+ cpuinfo_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ lshw_attachment
+ efi_attachment
+ lsmod_attachment
+ lspci_attachment
+ modprobe_attachment
+ modules_attachment
+ sysfs_attachment
+ sysctl_attachment
+ udev_attachment
+ audio/list_devices
+ audio/playback_headphones
+ audio/playback_auto
+ audio/alsa_record_playback_external
+ audio/alsa_record_playback_internal
+ audio/alsa_record_playback_usb
+ audio/playback_auto
+ benchmarks/disk/hdparm-read_.*
+ benchmarks/disk/hdparm-cache-read_.*
+ bluetooth/detect-output
+ camera/detect
+ camera/still
+ camera/display
+ cpu/offlining_test
+ cpu/topology
+ cpu/clocktest
+ disk/detect
+ firewire/insert
+ firewire/storage-test
+ firewire/remove
+ graphics/1_compiz_check.*
+ graphics/1_resolution.*
+ graphics/1_minimum_resolution.*
+ graphics/1_driver_version.*
+ graphics/VESA_drivers_not_in_use
+ input/keyboard
+ input/mouse
+ keys/super
+ keys/battery-info
+ keys/brightness
+ keys/media-control
+ keys/mute
+ keys/volume
+ keys/wireless
+ mediacard/mmc-insert
+ mediacard/mmc-storage
+ mediacard/mmc-remove
+ mediacard/sd-insert
+ mediacard/sd-storage
+ mediacard/sd-remove
+ mediacard/sdhc-insert
+ mediacard/sdhc-storage
+ mediacard/sdhc-remove
+ mediacard/cf-insert
+ mediacard/cf-storage
+ mediacard/cf-remove
+ memory/info
+ monitor/hdmi
+ monitor/vga
+ monitor/powersaving
+ ethernet/detect
+ wireless/wireless_connection
+ optical/detect
+ optical/read_.*
+ expresscard/verification
+ power-management/rtc
+ suspend/audio_before_suspend
+ suspend/memory_before_suspend
+ suspend/network_before_suspend
+ suspend/resolution_before_suspend
+ suspend/suspend_advanced
+ suspend/wireless_before_suspend
+ keys/sleep
+ suspend/mmc-insert-after-suspend
+ suspend/mmc-storage-after-suspend
+ suspend/mmc-remove-after-suspend
+ suspend/sd-insert-after-suspend
+ suspend/sd-storage-after-suspend
+ suspend/sd-remove-after-suspend
+ suspend/sdhc-insert-after-suspend
+ suspend/sdhc-storage-after-suspend
+ suspend/sdhc-remove-after-suspend
+ mediacard/cf-insert-after-suspend
+ mediacard/cf-storage-after-suspend
+ mediacard/cf-remove-after-suspend
+ suspend/audio_after_suspend
+ suspend/bluetooth_detect_after_suspend
+ suspend/memory_after_suspend
+ suspend/network_after_suspend
+ suspend/resolution_after_suspend
+ suspend/wireless_after_suspend
+ usb/detect
+ usb/insert
+ usb/storage-automated
+ usb/remove
+bootstrap_include:
+ benchmarks/disk/hdparm-read
+ benchmarks/disk/hdparm-cache-read
+ optical/read
+ graphics/generator_compiz_check
+ graphics/generator_resolution
+ graphics/generator_minimum_resolution
+ graphics/generator_driver_version
diff --git a/units/hwsubmit.pxu b/units/hwsubmit.pxu
new file mode 100644
index 0000000..d2ca682
--- /dev/null
+++ b/units/hwsubmit.pxu
@@ -0,0 +1,35 @@
+id: hwsubmit
+_name: All HW Submit Tests
+unit: test plan
+include:
+ cdimage
+ cpuinfo
+ device
+ dmi
+ dpkg
+ gconf
+ lsb
+ meminfo
+ module
+ package
+ uname
+ usb
+ info/buildstamp
+ cpuinfo_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ kernel_cmdline_attachment
+ recovery_info_attachment
+ dell_bto_xml_attachment
+ lsmod_attachment
+ dkms_info_attachment
+ lspci_attachment
+ lspci_standard_config_attachment
+ modinfo_attachment
+ modprobe_attachment
+ modules_attachment
+ sysfs_attachment
+ sysctl_attachment
+ udev_attachment
+ 
diff --git a/units/smoke.pxu b/units/smoke.pxu
new file mode 100644
index 0000000..70c5cff
--- /dev/null
+++ b/units/smoke.pxu
@@ -0,0 +1,30 @@
+id: smoke
+_name: All Smoke Tests
+unit: test plan
+description:
+ This is an example test plan to start from.
+ To use, copy this file and add the jobs you want to run to the copy. Delete
+ these comments. DO NOT delete the first 9 jobs in tis file.
+ They are resource gathering jobs and are necessary to do any testing at all.
+include:
+ cpuinfo
+ cdimage
+ dmi
+ dpkg
+ efi
+ environment
+ gconf
+ lsb
+ meminfo
+ module
+ package
+ device
+ uname
+ smoke/true
+ smoke/false
+ smoke/dependency/good
+ smoke/dependency/bad
+ smoke/requirement/good
+ smoke/requirement/bad
+ smoke/manual
+ 
diff --git a/units/sniff.pxu b/units/sniff.pxu
new file mode 100644
index 0000000..c8e69e9
--- /dev/null
+++ b/units/sniff.pxu
@@ -0,0 +1,35 @@
+id: sniff
+_name: All Sniff Tests
+unit: test plan
+description:
+ This is an example test plan to start from.
+ To use, copy this file and add the jobs you want to run to the copy. Delete
+ these comments. DO NOT delete the first 9 jobs in tis file.
+ They are resource gathering jobs and are necessary to do any testing at all.
+include:
+ cdimage
+ cpuinfo
+ device
+ dmi
+ dpkg
+ efi
+ environment
+ gconf
+ lsb
+ meminfo
+ module
+ package
+ rtc
+ sleep
+ uname
+ info/audio_device_driver
+ sniff/sniff7
+ sniff/sniff6
+ sniff/sniff5
+ sniff/sniff4
+ sniff/sniff3
+ sniff/sniff2
+ sniff/sniff1
+ power-management/rtc
+ suspend/suspend_advanced
+ suspend/suspend-time-check
diff --git a/units/sru.pxu b/units/sru.pxu
new file mode 100644
index 0000000..6c18f48
--- /dev/null
+++ b/units/sru.pxu
@@ -0,0 +1,116 @@
+id: sru
+_name: All SRU Tests
+unit: test plan
+description:
+ This test plan contains tests that are useful for validating a Stable
+ Release Update (SRU) on Ubuntu Certified systems. This test plan is not
+ recommended for, nor will it be accepted for self-testing purposes.
+include:
+ IEEE_80211
+ block_device
+ cdimage
+ cpuinfo
+ device
+ dmi
+ dpkg
+ efi
+ environment
+ gconf
+ lsb
+ meminfo
+ module
+ package
+ rtc
+ sleep
+ uname
+ xinput
+ acpi_sleep_attachment
+ codecs_attachment
+ cpuinfo_attachment
+ dmesg_attachment
+ dmi_attachment
+ dmidecode_attachment
+ efi_attachment
+ lspci_attachment
+ meminfo_attachment
+ modprobe_attachment
+ modules_attachment
+ sysctl_attachment
+ sysfs_attachment
+ udev_attachment
+ lsmod_attachment
+ audio/alsa_record_playback_automated
+ bluetooth/detect-output
+ camera/detect
+ camera/multiple-resolution-images
+ cpu/scaling_test
+ cpu/scaling_test-log-attach
+ cpu/offlining_test
+ cpu/topology
+ disk/read_performance_.*
+ graphics/xorg-version
+ graphics/1_compiz_check_.*
+ graphics/xorg-failsafe
+ graphics/xorg-process
+ graphics/1_screenshot_.*
+ 1_screenshot_.*.jpg
+ graphics/1_screenshot_fullscreen_video_.*
+ 1_screenshot_fullscreen_video_.*.jpg
+ graphics/screenshot_opencv_validation
+ screenshot_opencv_validation.jpg
+ install/apt-get-gets-updates
+ mediacard/sd-preinserted
+ memory/info
+ memory/check
+ ethernet/detect
+ ethernet/info_automated
+ networking/http
+ networking/gateway_ping
+ power-management/tickless_idle
+ power-management/rtc
+ power-management/fwts_wakealarm
+ power-management/fwts_wakealarm-log-attach
+ usb/detect
+ usb/storage-preinserted
+ wireless/wireless_scanning
+ wireless/wireless_connection_wpa_bg
+ wireless/wireless_connection_open_bg
+ wireless/wireless_connection_wpa_n
+ wireless/wireless_connection_open_n
+ wireless/monitor_wireless_connection_udp
+ suspend/audio_before_suspend
+ suspend/bluetooth_obex_send_before_suspend
+ suspend/bluetooth_obex_browse_before_suspend
+ suspend/bluetooth_obex_get_before_suspend
+ suspend/cpu_before_suspend
+ suspend/network_before_suspend
+ suspend/memory_before_suspend
+ suspend/suspend_advanced_auto
+ suspend/suspend-single-log-check
+ suspend/suspend-single-log-attach
+ suspend/audio_after_suspend_auto
+ suspend/network_resume_time_auto
+ suspend/wifi_resume_time_auto
+ suspend/usb_storage_preinserted_after_suspend
+ suspend/record_playback_after_suspend_auto
+ suspend/bluetooth_obex_send_after_suspend_auto
+ suspend/bluetooth_obex_browse_after_suspend_auto
+ suspend/bluetooth_obex_get_after_suspend_auto
+ suspend/cpu_after_suspend_auto
+ suspend/memory_after_suspend_auto
+ suspend/wireless_connection_after_suspend_wpa_bg_auto
+ suspend/wireless_connection_after_suspend_open_bg_auto
+ suspend/wireless_connection_after_suspend_wpa_n_auto
+ suspend/wireless_connection_after_suspend_open_n_auto
+ suspend/gpu_lockup_after_suspend
+ suspend/screenshot_after_suspend
+ screenshot_after_suspend.jpg
+bootstrap_include:
+ disk/read_performance
+ graphics/generator_compiz_check
+ graphics/generator_screenshot
+ graphics/generator_screenshot.jpg
+ graphics/generator_screenshot_fullscreen_video
+ graphics/generator_screenshot_fullscreen_video.jpg
+ graphics/generator_screenshot_fullscreen_video
+ graphics/generator_screenshot_fullscreen_video.jpg
diff --git a/whitelists/autotesting.whitelist b/whitelists/autotesting.whitelist
deleted file mode 100644
index 36472f6..0000000
--- a/whitelists/autotesting.whitelist
+++ /dev/null
@@ -1,118 +0,0 @@
-## This whitelist is used for automated testing of the test cases themselves.
-# These resources are needed for a valid submission, so they are included
-# explicitly, even if they are usually run implicitly by jobs requiring them.
-IEEE_80211
-cpuinfo
-dpkg
-lsb
-package
-uname
-#File Attachment Jobs
-__info__
-acpi_sleep_attachment
-codecs_attachment
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-efi_attachment
-lspci_attachment
-lspci_standard_config_attachment
-meminfo_attachment
-modinfo_attachment
-modprobe_attachment
-modules_attachment
-sysctl_attachment
-sysfs_attachment
-udev_attachment
-recovery_info_attachment
-dell_bto_xml_attachment
-lsmod_attachment
-dkms_info_attachment
-#Automated Test-verification Jobs
-__audio__
-audio/alsa_record_playback_automated
-__bluetooth__
-bluetooth/detect-output
-__camera__
-camera/detect
-camera/multiple-resolution-images
-__cpu__
-cpu/scaling_test
-cpu/scaling_test-log-attach
-cpu/offlining_test
-cpu/topology
-__disk__
-disk/read_performance
-disk/read_performance_.*
-__graphics__
-graphics/generator_.*
-graphics/xorg-version
-graphics/1_compiz_check_.*
-graphics/xorg-failsafe
-graphics/xorg-process
-graphics/1_screenshot_.*
-1_screenshot_.*.jpg
-graphics/1_screenshot_fullscreen_video_.*
-1_screenshot_fullscreen_video_.*.jpg
-__install__
-install/apt-get-gets-updates
-__mediacard__
-mediacard/sd-preinserted
-__memory__
-memory/info
-memory/check
-__miscellanea__
-miscellanea/submission-resources
-miscellanea/fwts_test
-miscellanea/fwts_results.log
-__ethernet__
-ethernet/detect
-networking/http
-networking/gateway_ping
-__power-management__
-power-management/tickless_idle
-power-management/rtc
-power-management/fwts_wakealarm
-power-management/fwts_wakealarm-log-attach
-__usb__
-usb/detect
-usb/storage-preinserted
-__wireless__
-wireless/wireless_scanning
-wireless/wireless_connection_wpa_bg
-wireless/wireless_connection_open_bg
-wireless/wireless_connection_wpa_n
-wireless/wireless_connection_open_n
-wireless/wireless_connection_wpa_ac
-wireless/wireless_connection_open_ac
-wireless/monitor_wireless_connection_udp
-__suspend__
-suspend/audio_before_suspend
-suspend/bluetooth_obex_send_before_suspend
-suspend/bluetooth_obex_browse_before_suspend
-suspend/bluetooth_obex_get_before_suspend
-suspend/cpu_before_suspend
-suspend/network_before_suspend
-suspend/memory_before_suspend
-suspend/suspend_advanced_auto
-suspend/suspend-single-log-check
-suspend/audio_after_suspend_auto
-suspend/network_resume_time_auto
-suspend/wifi_resume_time_auto
-suspend/usb_storage_preinserted_after_suspend
-suspend/record_playback_after_suspend_auto
-suspend/bluetooth_obex_send_after_suspend_auto
-suspend/bluetooth_obex_browse_after_suspend_auto
-suspend/bluetooth_obex_get_after_suspend_auto
-suspend/cpu_after_suspend_auto
-suspend/memory_after_suspend_auto
-suspend/wireless_connection_after_suspend_wpa_bg_auto
-suspend/wireless_connection_after_suspend_open_bg_auto
-suspend/wireless_connection_after_suspend_wpa_n_auto
-suspend/wireless_connection_after_suspend_open_n_auto
-suspend/wireless_connection_after_suspend_wpa_ac_auto
-suspend/wireless_connection_after_suspend_open_ac_auto
-suspend/gpu_lockup_after_suspend
-suspend/screenshot_after_suspend
-screenshot_after_suspend.jpg
diff --git a/whitelists/default.whitelist b/whitelists/default.whitelist
deleted file mode 100644
index 0363c7e..0000000
--- a/whitelists/default.whitelist
+++ /dev/null
@@ -1,131 +0,0 @@
-optical_drive
-__miscellanea__
-miscellanea/submission-resources
-miscellanea/is_laptop
-__info__
-codecs_attachment
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-lshw_attachment
-efi_attachment
-lsmod_attachment
-lspci_attachment
-modprobe_attachment
-modules_attachment
-sysfs_attachment
-sysctl_attachment
-udev_attachment
-__audio__
-audio/list_devices
-audio/playback_headphones
-audio/playback_auto
-audio/alsa_record_playback_external
-audio/alsa_record_playback_internal
-audio/alsa_record_playback_usb
-audio/playback_auto
-__benchmarks__
-benchmarks/disk/hdparm-read
-benchmarks/disk/hdparm-read_.*
-benchmarks/disk/hdparm-cache-read
-benchmarks/disk/hdparm-cache-read_.*
-__bluetooth__
-bluetooth/detect-output
-__camera__
-camera/detect
-camera/still
-camera/display
-__cpu__
-cpu/offlining_test
-cpu/topology
-cpu/clocktest
-__disk__
-disk/detect
-__firewire__
-firewire/insert
-firewire/storage-test
-firewire/remove
-__graphics__
-graphics/generator_.*
-graphics/1_compiz_check.*
-graphics/video
-graphics/1_resolution.*
-graphics/1_minimum_resolution.*
-graphics/1_driver_version.*
-graphics/VESA_drivers_not_in_use
-__input__
-input/keyboard
-input/mouse
-__keys__
-keys/super
-keys/battery-info
-keys/brightness
-keys/media-control
-keys/mute
-keys/volume
-keys/wireless
-__mediacard__
-mediacard/mmc-insert
-mediacard/mmc-storage
-mediacard/mmc-remove
-mediacard/sd-insert
-mediacard/sd-storage
-mediacard/sd-remove
-mediacard/sdhc-insert
-mediacard/sdhc-storage
-mediacard/sdhc-remove
-mediacard/cf-insert
-mediacard/cf-storage
-mediacard/cf-remove
-__memory__
-memory/info
-__monitor__
-monitor/hdmi
-monitor/vga
-monitor/powersaving
-__ethernet__
-ethernet/detect
-__wireless__
-wireless/wireless_connection
-__optical__
-optical/detect
-optical/read
-optical/read_.*
-__expresscard__
-expresscard/verification
-__power-management__
-power-management/rtc
-__suspend__
-suspend/audio_before_suspend
-suspend/memory_before_suspend
-suspend/network_before_suspend
-suspend/resolution_before_suspend
-suspend/suspend_advanced
-suspend/wireless_before_suspend
-# Test sleep key after we ensured suspend works
-keys/sleep
-suspend/mmc-insert-after-suspend
-suspend/mmc-storage-after-suspend
-suspend/mmc-remove-after-suspend
-suspend/sd-insert-after-suspend
-suspend/sd-storage-after-suspend
-suspend/sd-remove-after-suspend
-suspend/sdhc-insert-after-suspend
-suspend/sdhc-storage-after-suspend
-suspend/sdhc-remove-after-suspend
-mediacard/cf-insert-after-suspend
-mediacard/cf-storage-after-suspend
-mediacard/cf-remove-after-suspend
-suspend/audio_after_suspend
-suspend/bluetooth_detect_after_suspend
-suspend/memory_after_suspend
-suspend/network_after_suspend
-suspend/resolution_after_suspend
-suspend/wireless_after_suspend
-
-__usb__
-usb/detect
-usb/insert
-usb/storage-automated
-usb/remove
diff --git a/whitelists/hwsubmit.whitelist b/whitelists/hwsubmit.whitelist
deleted file mode 100644
index 218bd1d..0000000
--- a/whitelists/hwsubmit.whitelist
+++ /dev/null
@@ -1,31 +0,0 @@
-cdimage
-cpuinfo
-device
-dmi
-dpkg
-gconf
-lsb
-meminfo
-module
-package
-uname
-usb
-__info__
-info/buildstamp
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-kernel_cmdline_attachment
-recovery_info_attachment
-dell_bto_xml_attachment
-lsmod_attachment
-dkms_info_attachment
-lspci_attachment
-lspci_standard_config_attachment
-modinfo_attachment
-modprobe_attachment
-modules_attachment
-sysfs_attachment
-sysctl_attachment
-udev_attachment
diff --git a/whitelists/smoke.whitelist b/whitelists/smoke.whitelist
deleted file mode 100644
index 98e287d..0000000
--- a/whitelists/smoke.whitelist
+++ /dev/null
@@ -1,27 +0,0 @@
-## This is an example whitelist to start from.
-## To use, copy this file and add the jobs you want to run to the copy. Delete
-## these comments. DO NOT delete the first 9 jobs in tis file. They are resource
-## gathering jobs and are necessary to do any testing at all.
-# Resource Jobs (listed in jobs/resource.txt)
-cpuinfo
-cdimage
-dmi
-dpkg
-efi
-environment
-gconf
-lsb
-meminfo
-module
-package
-device
-uname
-# Smoke test cases
-__smoke__
-smoke/true
-smoke/false
-smoke/dependency/good
-smoke/dependency/bad
-smoke/requirement/good
-smoke/requirement/bad
-smoke/manual
diff --git a/whitelists/sniff.whitelist b/whitelists/sniff.whitelist
deleted file mode 100644
index a68fefc..0000000
--- a/whitelists/sniff.whitelist
+++ /dev/null
@@ -1,36 +0,0 @@
-## This is an example whitelist to start from.
-## To use, copy this file and add the jobs you want to run to the copy. Delete
-## these comments. DO NOT delete the first 9 jobs in tis file. They are resource
-## gathering jobs and are necessary to do any testing at all.
-# Resource Jobs (listed in jobs/resource.txt)
-cdimage
-cpuinfo
-device
-dmi
-dpkg
-efi
-environment
-gconf
-lsb
-meminfo
-module
-package
-rtc
-sleep
-uname
-# Smoke sniffcases
-__info__
-info/audio_device_driver
-__sniff__
-sniff/sniff7
-sniff/sniff6
-sniff/sniff5
-sniff/sniff4
-sniff/sniff3
-sniff/sniff2
-sniff/sniff1
-__power-management__
-power-management/rtc
-__suspend__
-suspend/suspend_advanced
-suspend/suspend-time-check
diff --git a/whitelists/sru.whitelist b/whitelists/sru.whitelist
deleted file mode 100644
index d0872a9..0000000
--- a/whitelists/sru.whitelist
+++ /dev/null
@@ -1,122 +0,0 @@
-## This whitelist contains tests that are useful for validating a Stable
-## Release Update (SRU) on Ubuntu Certified systems. This whitelist is not
-## recommended for, nor will it be accepted for self-testing purposes.
-IEEE_80211
-block_device
-cdimage
-cpuinfo
-device
-dmi
-dpkg
-efi
-environment
-gconf
-lsb
-meminfo
-module
-package
-rtc
-sleep
-uname
-xinput
-#File Attachment Jobs
-__info__
-acpi_sleep_attachment
-codecs_attachment
-cpuinfo_attachment
-dmesg_attachment
-dmi_attachment
-dmidecode_attachment
-efi_attachment
-lspci_attachment
-meminfo_attachment
-modprobe_attachment
-modules_attachment
-sysctl_attachment
-sysfs_attachment
-udev_attachment
-lsmod_attachment
-#SRU Test Suite Jobs
-__audio__
-audio/alsa_record_playback_automated
-__bluetooth__
-bluetooth/detect-output
-__camera__
-camera/detect
-camera/multiple-resolution-images
-__cpu__
-cpu/scaling_test
-cpu/scaling_test-log-attach
-cpu/offlining_test
-cpu/topology
-__disk__
-disk/read_performance
-disk/read_performance_.*
-__graphics__
-graphics/generator_.*
-graphics/xorg-version
-graphics/1_compiz_check_.*
-graphics/xorg-failsafe
-graphics/xorg-process
-graphics/1_screenshot_.*
-1_screenshot_.*.jpg
-graphics/1_screenshot_fullscreen_video_.*
-1_screenshot_fullscreen_video_.*.jpg
-graphics/screenshot_opencv_validation
-screenshot_opencv_validation.jpg
-__install__
-install/apt-get-gets-updates
-__mediacard__
-mediacard/sd-preinserted
-__memory__
-memory/info
-memory/check
-__ethernet__
-ethernet/detect
-ethernet/info_automated
-__networking__
-networking/http
-networking/gateway_ping
-__power-management__
-power-management/tickless_idle
-power-management/rtc
-power-management/fwts_wakealarm
-power-management/fwts_wakealarm-log-attach
-__usb__
-usb/detect
-usb/storage-preinserted
-__wireless__
-wireless/wireless_scanning
-wireless/wireless_connection_wpa_bg
-wireless/wireless_connection_open_bg
-wireless/wireless_connection_wpa_n
-wireless/wireless_connection_open_n
-wireless/monitor_wireless_connection_udp
-__suspend__
-suspend/audio_before_suspend
-suspend/bluetooth_obex_send_before_suspend
-suspend/bluetooth_obex_browse_before_suspend
-suspend/bluetooth_obex_get_before_suspend
-suspend/cpu_before_suspend
-suspend/network_before_suspend
-suspend/memory_before_suspend
-suspend/suspend_advanced_auto
-suspend/suspend-single-log-check
-suspend/suspend-single-log-attach
-suspend/audio_after_suspend_auto
-suspend/network_resume_time_auto
-suspend/wifi_resume_time_auto
-suspend/usb_storage_preinserted_after_suspend
-suspend/record_playback_after_suspend_auto
-suspend/bluetooth_obex_send_after_suspend_auto
-suspend/bluetooth_obex_browse_after_suspend_auto
-suspend/bluetooth_obex_get_after_suspend_auto
-suspend/cpu_after_suspend_auto
-suspend/memory_after_suspend_auto
-suspend/wireless_connection_after_suspend_wpa_bg_auto
-suspend/wireless_connection_after_suspend_open_bg_auto
-suspend/wireless_connection_after_suspend_wpa_n_auto
-suspend/wireless_connection_after_suspend_open_n_auto
-suspend/gpu_lockup_after_suspend
-suspend/screenshot_after_suspend
-screenshot_after_suspend.jpg