Skip to content

Commit e37bbc9

Browse files
committed
Enhanced setup.py to support Ubuntu 18.10 and 19.04
Signed-off-by: Waldemar Kozaczuk <[email protected]>
1 parent c839511 commit e37bbc9

File tree

1 file changed

+21
-8
lines changed

1 file changed

+21
-8
lines changed

scripts/setup.py

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ class Ubuntu(object):
244244
'libncurses5-dev',
245245
'libssl-dev',
246246
'libtool',
247-
'libvirt-bin',
248247
'libyaml-cpp-dev',
249248
'maven',
250249
'openssl',
@@ -262,49 +261,63 @@ class Ubuntu(object):
262261
test_packages = ['libssl-dev', 'zip']
263262
ec2_post_install = None
264263

264+
class Ubuntu_19_04(object):
265+
packages = ['openjdk-8-jdk', 'bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
266+
ec2_packages = ['ec2-api-tools', 'awscli']
267+
test_packages = []
268+
ec2_post_install = None
269+
version = '19.04'
270+
271+
class Ubuntu_18_10(object):
272+
packages = ['openjdk-8-jdk', 'bridge-utils', 'libvirt-daemon-system', 'libvirt-clients']
273+
ec2_packages = ['ec2-api-tools', 'awscli']
274+
test_packages = []
275+
ec2_post_install = None
276+
version = '18.10'
277+
265278
class Ubuntu_18_04(object):
266-
packages = ['openjdk-8-jdk', 'bridge-utils']
279+
packages = ['openjdk-8-jdk', 'bridge-utils', 'libvirt-bin']
267280
ec2_packages = ['ec2-api-tools', 'awscli']
268281
test_packages = []
269282
ec2_post_install = None
270283
version = '18.04'
271284

272285
class Ubuntu_17_04(object):
273-
packages = ['openjdk-8-jdk']
286+
packages = ['openjdk-8-jdk', 'libvirt-bin']
274287
ec2_packages = ['ec2-api-tools', 'awscli']
275288
test_packages = []
276289
ec2_post_install = None
277290
version = '17.04'
278291

279292
class Ubuntu_16_04(object):
280-
packages = ['openjdk-8-jdk']
293+
packages = ['openjdk-8-jdk', 'libvirt-bin']
281294
ec2_packages = ['ec2-api-tools', 'awscli']
282295
test_packages = []
283296
ec2_post_install = None
284297
version = '16.04'
285298

286299
class Ubuntu_15_04(object):
287-
packages = ['openjdk-7-jdk']
300+
packages = ['openjdk-7-jdk', 'libvirt-bin']
288301
ec2_packages = ['ec2-api-tools', 'awscli']
289302
test_packages = []
290303
ec2_post_install = None
291304
version = '15.04'
292305

293306
class Ubuntu_14_04(object):
294-
packages = ['openjdk-7-jdk']
307+
packages = ['openjdk-7-jdk', 'libvirt-bin']
295308
ec2_packages = ['ec2-api-tools', 'awscli']
296309
test_packages = []
297310
ec2_post_install = None
298311
version = '14.04'
299312

300313
class Ubuntu_13_10(object):
301-
packages = ['openjdk-7-jdk']
314+
packages = ['openjdk-7-jdk', 'libvirt-bin']
302315
ec2_packages = []
303316
test_packages = []
304317
ec2_post_install = standard_ec2_post_install
305318
version = '13.10'
306319

307-
versions = [Ubuntu_18_04, Ubuntu_17_04, Ubuntu_16_04, Ubuntu_15_04, Ubuntu_14_04, Ubuntu_13_10]
320+
versions = [Ubuntu_19_04, Ubuntu_18_10, Ubuntu_18_04, Ubuntu_17_04, Ubuntu_16_04, Ubuntu_15_04, Ubuntu_14_04, Ubuntu_13_10]
308321

309322
class LinuxMint(Ubuntu):
310323
name = 'LinuxMint'

0 commit comments

Comments
 (0)