summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-04-01 15:52:58 +0000
committerintrigeri <intrigeri@boum.org>2015-04-01 16:00:34 +0000
commit54a11af0b4360065f14305f1d69a094e86e5b75c (patch)
tree9070dd3620090a4c2a4809fce792519aba988e59
parent3231996404943024cc933acd08465f813739f5e3 (diff)
Adapt tails::tester to run on Jessie.test/8165-run-test-suite-in-jessie
1. Handle upgrade from Wheezy by dropping obsolete APT pinning. 2. Upgrade list of dependencies for Jessie.
-rw-r--r--manifests/tester.pp111
1 files changed, 14 insertions, 97 deletions
diff --git a/manifests/tester.pp b/manifests/tester.pp
index a1e6be4..4fd02b5 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',