diff -Nru bzr-olsvms-0.1.0/debian/bzr-builder.manifest bzr-olsvms-0.1.1/debian/bzr-builder.manifest --- bzr-olsvms-0.1.0/debian/bzr-builder.manifest 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/debian/bzr-builder.manifest 2016-09-01 11:28:39.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~11 -lp:bzr-olsvms revid:v.ladeuil+lp@free.fr-20160729123414-evtslojaztwb7qdb +# bzr-builder format 0.3 deb-version {debupstream}-0~14 +lp:bzr-olsvms revid:v.ladeuil+lp@free.fr-20160901112613-ax05jre9nwzmt570 diff -Nru bzr-olsvms-0.1.0/debian/changelog bzr-olsvms-0.1.1/debian/changelog --- bzr-olsvms-0.1.0/debian/changelog 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/debian/changelog 2016-09-01 11:28:39.000000000 +0000 @@ -1,8 +1,16 @@ -bzr-olsvms (0.1.0-0~11~ubuntu14.04.1) trusty; urgency=low +bzr-olsvms (0.1.1-0~14~ubuntu14.04.1) trusty; urgency=low * Auto build. - -- Vincent Ladeuil Fri, 29 Jul 2016 12:38:01 +0000 + -- Vincent Ladeuil Thu, 01 Sep 2016 11:28:39 +0000 + +bzr-olsvms (0.1.1) unstable; urgency=medium + + * Fix the existing_vms.conf for tests, *all* options should be inside + the vm section or they are ignored (rightly) in recent ols-vms + versions. + + -- Vincent Ladeuil Thu, 01 Sep 2016 13:25:11 +0200 bzr-olsvms (0.1.0) unstable; urgency=medium diff -Nru bzr-olsvms-0.1.0/info.py bzr-olsvms-0.1.1/info.py --- bzr-olsvms-0.1.0/info.py 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/info.py 2016-09-01 11:28:39.000000000 +0000 @@ -5,7 +5,7 @@ from __future__ import absolute_import bzr_plugin_name = 'olsvms' -bzr_plugin_version = (0, 1, 0, 'final', 0) +bzr_plugin_version = (0, 1, 1, 'final', 0) bzr_compatible_versions = [(2, x, 0) for x in [7, 8]] bzr_minimum_version = bzr_compatible_versions[0] bzr_maximum_version = bzr_compatible_versions[-1] diff -Nru bzr-olsvms-0.1.0/NEWS.rst bzr-olsvms-0.1.1/NEWS.rst --- bzr-olsvms-0.1.0/NEWS.rst 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/NEWS.rst 2016-09-01 11:28:39.000000000 +0000 @@ -4,6 +4,12 @@ Overview of changes to bzr-olsvms in reverse chronological order. +0.1.1 +===== + +* Fix the existing_vms.conf for tests, *all* options should be inside the vm + section or they are ignored (rightly) in recent ols-vms versions. + 0.1.0 ===== diff -Nru bzr-olsvms-0.1.0/tests/fixtures.py bzr-olsvms-0.1.1/tests/fixtures.py --- bzr-olsvms-0.1.0/tests/fixtures.py 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/tests/fixtures.py 2016-09-01 11:28:39.000000000 +0000 @@ -28,13 +28,15 @@ for opt in ('class', 'ip'): opts[opt] = get_option_value('vm.{}'.format(opt)) opts['ssh_opts'] = get_option_value('ssh.options') + opts['ssh_key'] = get_option_value('ssh.key') path = os.path.expanduser('~/.config/ols-vms/existing-vms.conf') os.makedirs(os.path.dirname(path)) with open(path, 'w') as f: f.write('''\ - ssh.options = {ssh_opts} [{name}] vm.name = {name} vm.class = {class} vm.ip = {ip} +ssh.options = {ssh_opts} +ssh.key = {ssh_key} '''.format(**opts)) diff -Nru bzr-olsvms-0.1.0/tests/ols-vms.conf bzr-olsvms-0.1.1/tests/ols-vms.conf --- bzr-olsvms-0.1.0/tests/ols-vms.conf 2016-07-29 12:38:01.000000000 +0000 +++ bzr-olsvms-0.1.1/tests/ols-vms.conf 2016-09-01 11:28:39.000000000 +0000 @@ -3,7 +3,6 @@ # To set them up (or refresh them from time to time): # $ ols-vms setup bzr-olsvms -# $ ols-vms stop bzr-olsvms # $ ols-vms publish bzr-olsvms # $ ols-vms setup bzr-olsvms-testbed @@ -16,8 +15,10 @@ vm.class = lxd lxd.image = ubuntu:{vm.release}/{vm.architecture} vm.published_as = bzr-olsvms +vm.poweroff = True # The testbed itself inherits from the base and uses its image [bzr-olsvms-testbed] vm.class = lxd vm.update = False lxd.image = bzr-olsvms +vm.poweroff = False