diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-05-23 08:39:50 (GMT) |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2016-05-23 08:39:50 (GMT) |
| commit | 6676ed6eaa6342b51e331ab4a99166bea3794384 (patch) | |
| tree | dd1b3c9e8190a163492c6ca319bd4bfbbab028e4 | |
| parent | 837843d0d2f4692155ff06eed800ab81bc37327c (diff) | |
tools/adt-buildvm-ubuntu-cloud: Adjust to new cloud image names from Ubuntu 16.10
The -disk1 suffix got dropped now.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | tools/adt-buildvm-ubuntu-cloud | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 6c17164..d835e3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ autopkgtest (3.20.7) UNRELEASED; urgency=medium * tests/adt-run: Make SchrootClickRunner tests work with a standard schroot (i. e. no click and SDK preinstalled), by installing the packages via --setup-command. + * tools/adt-buildvm-ubuntu-cloud: Adjust to new cloud image names from + Ubuntu 16.10. -- Martin Pitt <mpitt@debian.org> Thu, 19 May 2016 23:22:20 +0200 diff --git a/tools/adt-buildvm-ubuntu-cloud b/tools/adt-buildvm-ubuntu-cloud index b5f9304..4f6739c 100755 --- a/tools/adt-buildvm-ubuntu-cloud +++ b/tools/adt-buildvm-ubuntu-cloud @@ -149,7 +149,11 @@ def parse_args(): def download_image(cloud_img_url, release, arch): - diskname = '%s-server-cloudimg-%s-disk1.img' % (release, arch) + if release in ['precise', 'trusty', 'wily', 'xenial']: + diskname = '%s-server-cloudimg-%s-disk1.img' % (release, arch) + else: + # images were renamed in Ubuntu 16.10 + diskname = '%s-server-cloudimg-%s.img' % (release, arch) image_url = '%s/%s/current/%s' % (cloud_img_url, release, diskname) local_image = os.path.join(workdir, diskname) |