| Message ID | 20220707040310.4163682-10-jsnow@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improve reliability of VM tests | expand |
On Thu, Jul 07, 2022 at 12:03:06AM -0400, John Snow wrote: > 18.04 has fallen out of our support window, so move ubuntu.aarch64 > forward to ubuntu 20.04, which is now our oldest supported Ubuntu > release. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/vm/ubuntu.aarch64 | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> With regards, Daniel
On 7/7/22 09:33, John Snow wrote: > 18.04 has fallen out of our support window, so move ubuntu.aarch64 > forward to ubuntu 20.04, which is now our oldest supported Ubuntu > release. Ah. Squash with patch 5? r~ > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/vm/ubuntu.aarch64 | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 > index fc9c2ce22ff..666947393bd 100755 > --- a/tests/vm/ubuntu.aarch64 > +++ b/tests/vm/ubuntu.aarch64 > @@ -32,13 +32,13 @@ DEFAULT_CONFIG = { > class UbuntuAarch64VM(ubuntuvm.UbuntuVM): > name = "ubuntu.aarch64" > arch = "aarch64" > - # NOTE: The Ubuntu 18.04 cloud images are updated weekly. The > - # release below has been chosen as the latest at time of writing. > - # Using the rolling latest release means the SHA will be wrong > - # within a week. > - image_name = "ubuntu-18.04-server-cloudimg-arm64.img" > - image_link = "https://cloud-images.ubuntu.com/releases/bionic/release-20220610/" + image_name > - image_sha256="0eacc5142238788365576b15f1d0b6f23dda6d3e545ee22f5306af7bd6ec47bd" > + # NOTE: The Ubuntu 20.04 cloud images are periodically updated. The > + # fixed image chosen below is the latest release at time of > + # writing. Using a rolling latest instead would mean that the SHA > + # would be incorrect at an indeterminate point in the future. > + image_name = "focal-server-cloudimg-arm64.img" > + image_link = "https://cloud-images.ubuntu.com/focal/20220615/" + image_name > + image_sha256="95a027336e197debe88c92ff2e554598e23c409139e1e750b71b3b820b514832" > BUILD_SCRIPT = """ > set -e; > cd $(mktemp -d);
On Thu, Jul 7, 2022 at 7:05 AM Richard Henderson <richard.henderson@linaro.org> wrote: > > On 7/7/22 09:33, John Snow wrote: > > 18.04 has fallen out of our support window, so move ubuntu.aarch64 > > forward to ubuntu 20.04, which is now our oldest supported Ubuntu > > release. > > Ah. Squash with patch 5? Can do. I left it split for testing purposes, but if we want both patches I can merge them. (Testing all of this was a nightmare.) --js
diff --git a/tests/vm/ubuntu.aarch64 b/tests/vm/ubuntu.aarch64 index fc9c2ce22ff..666947393bd 100755 --- a/tests/vm/ubuntu.aarch64 +++ b/tests/vm/ubuntu.aarch64 @@ -32,13 +32,13 @@ DEFAULT_CONFIG = { class UbuntuAarch64VM(ubuntuvm.UbuntuVM): name = "ubuntu.aarch64" arch = "aarch64" - # NOTE: The Ubuntu 18.04 cloud images are updated weekly. The - # release below has been chosen as the latest at time of writing. - # Using the rolling latest release means the SHA will be wrong - # within a week. - image_name = "ubuntu-18.04-server-cloudimg-arm64.img" - image_link = "https://cloud-images.ubuntu.com/releases/bionic/release-20220610/" + image_name - image_sha256="0eacc5142238788365576b15f1d0b6f23dda6d3e545ee22f5306af7bd6ec47bd" + # NOTE: The Ubuntu 20.04 cloud images are periodically updated. The + # fixed image chosen below is the latest release at time of + # writing. Using a rolling latest instead would mean that the SHA + # would be incorrect at an indeterminate point in the future. + image_name = "focal-server-cloudimg-arm64.img" + image_link = "https://cloud-images.ubuntu.com/focal/20220615/" + image_name + image_sha256="95a027336e197debe88c92ff2e554598e23c409139e1e750b71b3b820b514832" BUILD_SCRIPT = """ set -e; cd $(mktemp -d);
18.04 has fallen out of our support window, so move ubuntu.aarch64 forward to ubuntu 20.04, which is now our oldest supported Ubuntu release. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/vm/ubuntu.aarch64 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)