diff --git a/manifests/tester.pp b/manifests/tester.pp index a1e6be4e48b80a2d16cb77a7f5e757c8f6b92c24..4fd02b524f225b5517cc68fd759ebff955bd17b3 100644 --- a/manifests/tester.pp +++ b/manifests/tester.pp @@ -8,123 +8,39 @@ class tails::tester ( ### Sanity checks - if $::lsbdistcodename != 'wheezy' { - fail('The tails::tester module only supports Debian Wheezy.') + if $::lsbdistcodename != 'jessie' { + fail('The tails::tester module only supports Debian Jessie.') } ### Resources class { '::libvirt::host': - libvirt_service_name => 'libvirtd', # wheezy-backports qemu_security_driver => 'none', } - apt::preferences_snippet { 'cucumber': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ipxe-qemu': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'libspice-server1': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'libusb': - package => 'libusb-1.0-0', - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'libvirt0': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'libvirt-bin': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'libvirt-dev': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ovmf': - pin => 'release o=Debian,n=jessie', - priority => 991; - } - - apt::preferences_snippet { 'python-libvirt': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'qemu': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'qemu-kvm': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'qemu-system-x86': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'qemu-utils': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ruby-gherkin': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ruby-multi-json': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ruby-packetfu': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'ruby-rjb': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; - } - - apt::preferences_snippet { 'seabios': - pin => 'release o=Debian Backports,a=wheezy-backports', - priority => 991; + apt::preferences_snippet { + [ 'cucumber', 'ipxe-qemu', 'libspice-server1', 'libusb', 'libvirt0', + 'libvirt-bin', 'libvirt-dev', 'ovmf', 'python-libvirt', 'qemu', + 'qemu-kvm', 'qemu-system-x86', 'qemu-utils', 'ruby-gherkin', + 'ruby-multi-json', 'ruby-packetfu', 'ruby-rjb', 'seabios' + ]: + ensure => absent, } $tester_packages = [ 'cucumber', 'devscripts', 'dnsmasq-base', - 'ffmpeg', 'gawk', 'git', - 'libavcodec-extra-53', + 'i18nspector', + 'libav-tools', 'libcap2-bin', 'libsikuli-script-java', 'libvirt0', - 'libvirt-bin', - 'libvirt-daemon', + 'libvirt-clients', + 'libvirt-daemon-system', 'libvirt-dev', - 'libvirt-ruby', 'libvpx1', 'libxslt1-dev', 'ntp', @@ -137,6 +53,7 @@ class tails::tester ( 'radvd', 'ruby-guestfs', 'ruby-json', + 'ruby-libvirt', 'ruby-net-irc', 'ruby-packetfu', 'ruby-rjb',