On Mon, Sep 08, 2025 at 02:09:21PM +0800, Yumei Huang wrote: > Some of the download links are broken, and none of the images are > used in current tests. Removing them so it won't block make. > > Signed-off-by: Yumei Huang Ah, sorry. I realised I forgot some information when I suggested you make this change. Although we're not using these images at the moment, we hope to use them again some time in future. For that reason it's useful to keep the information about what the images were and how they worked in place. So, rather than removing this completely, it would be better to keep the {DEBIAN,...}_IMGS variables and the download targets, but just don't include them in DOWNLOAD_ASSETS for now. That will make it easier to put a fixed version of this back when we're ready. > --- > test/Makefile | 124 +------------------------------------------------- > 1 file changed, 1 insertion(+), 123 deletions(-) > > diff --git a/test/Makefile b/test/Makefile > index a774285..d7c37d6 100644 > --- a/test/Makefile > +++ b/test/Makefile > @@ -9,51 +9,7 @@ BATS = bats -j $(shell nproc) > EXETOOL = exeter/exetool/exetool > WGET = wget -c > > -DEBIAN_IMGS = debian-8.11.0-openstack-amd64.qcow2 \ > - debian-10-nocloud-amd64.qcow2 \ > - debian-10-generic-arm64.qcow2 \ > - debian-10-generic-ppc64el-20220911-1135.qcow2 \ > - debian-11-nocloud-amd64.qcow2 \ > - debian-11-generic-arm64.qcow2 \ > - debian-11-generic-ppc64el.qcow2 \ > - debian-sid-nocloud-amd64-daily.qcow2 \ > - debian-sid-nocloud-arm64-daily.qcow2 \ > - debian-sid-nocloud-ppc64el-daily.qcow2 > - > -FEDORA_IMGS = Fedora-Cloud-Base-26-1.5.x86_64.qcow2 \ > - Fedora-Cloud-Base-27-1.6.x86_64.qcow2 \ > - Fedora-Cloud-Base-28-1.1.x86_64.qcow2 \ > - Fedora-Cloud-Base-28-1.1.aarch64.qcow2 \ > - Fedora-Cloud-Base-29-1.2.x86_64.qcow2 \ > - Fedora-Cloud-Base-29-1.2.aarch64.qcow2 \ > - Fedora-Cloud-Base-30-1.2.x86_64.qcow2 \ > - Fedora-Cloud-Base-30-1.2.aarch64.qcow2 \ > - Fedora-Cloud-Base-31-1.9.x86_64.qcow2 \ > - Fedora-Cloud-Base-31-1.9.aarch64.qcow2 \ > - Fedora-Cloud-Base-32-1.6.x86_64.qcow2 \ > - Fedora-Cloud-Base-32-1.6.aarch64.qcow2 \ > - Fedora-Cloud-Base-33-1.2.x86_64.qcow2 \ > - Fedora-Cloud-Base-33-1.2.aarch64.qcow2 \ > - Fedora-Cloud-Base-34-1.2.x86_64.qcow2 \ > - Fedora-Cloud-Base-34-1.2.aarch64.qcow2 \ > - Fedora-Cloud-Base-35-1.2.x86_64.qcow2 \ > - Fedora-Cloud-Base-35-1.2.aarch64.qcow2 > - > -OPENSUSE_IMGS = openSUSE-Leap-15.1-JeOS.x86_64-kvm-and-xen.qcow2 \ > - openSUSE-Leap-15.2-JeOS.x86_64-kvm-and-xen.qcow2 \ > - openSUSE-Leap-15.3-JeOS.x86_64-kvm-and-xen.qcow2 \ > - openSUSE-Tumbleweed-ARM-JeOS-efi.aarch64.raw.xz \ > - openSUSE-Tumbleweed-ARM-JeOS-efi.armv7l.raw.xz > - > -UBUNTU_OLD_IMGS = trusty-server-cloudimg-amd64-disk1.img \ > - trusty-server-cloudimg-i386-disk1.img \ > - trusty-server-cloudimg-ppc64el-disk1.img > -UBUNTU_NEW_IMGS = xenial-server-cloudimg-powerpc-disk1.img \ > - jammy-server-cloudimg-s390x.img > -UBUNTU_IMGS = $(UBUNTU_OLD_IMGS) $(UBUNTU_NEW_IMGS) > - > -DOWNLOAD_ASSETS = exeter mbuto podman \ > - $(DEBIAN_IMGS) $(FEDORA_IMGS) $(OPENSUSE_IMGS) $(UBUNTU_IMGS) > +DOWNLOAD_ASSETS = exeter mbuto podman > TESTDATA_ASSETS = small.bin big.bin medium.bin \ > rampstream > LOCAL_ASSETS = mbuto.img mbuto.mem.img podman/bin/podman QEMU_EFI.fd \ > @@ -150,81 +106,3 @@ clean: > realclean: clean > rm -rf $(DOWNLOAD_ASSETS) > > -# Debian downloads > -debian-8.11.0-openstack-%.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/OpenStack/archive/8.11.0/debian-8.11.0-openstack-$*.qcow2 > - > -debian-10-nocloud-%.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/buster/latest/debian-10-nocloud-$*.qcow2 > - > -debian-10-generic-ppc64el-20220911-1135.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/buster/20220911-1135/debian-10-generic-ppc64el-20220911-1135.qcow2 > - > -debian-10-generic-%.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/buster/latest/debian-10-generic-$*.qcow2 > - > -debian-11-nocloud-%.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-nocloud-$*.qcow2 > - > -debian-11-generic-%.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-$*.qcow2 > - > -debian-sid-nocloud-%-daily.qcow2: > - $(WGET) -O $@ https://cloud.debian.org/images/cloud/sid/daily/latest/debian-sid-nocloud-$*-daily.qcow2 > - > -# Fedora downloads > -Fedora-Cloud-Base-26-1.5.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/26/CloudImages/$*/images/Fedora-Cloud-Base-26-1.5.$*.qcow2 > - > -Fedora-Cloud-Base-27-1.6.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/27/CloudImages/$*/images/Fedora-Cloud-Base-27-1.6.$*.qcow2 > - > -Fedora-Cloud-Base-28-1.1.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/28/Cloud/$*/images/Fedora-Cloud-Base-28-1.1.$*.qcow2 > - > -Fedora-Cloud-Base-29-1.2.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/29/Cloud/$*/images/Fedora-Cloud-Base-29-1.2.$*.qcow2 > - > -Fedora-Cloud-Base-30-1.2.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/Cloud/$*/images/Fedora-Cloud-Base-30-1.2.$*.qcow2 > - > -Fedora-Cloud-Base-31-1.9.%.qcow2: > - $(WGET) -O $@ http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/31/Cloud/$*/images/Fedora-Cloud-Base-31-1.9.$*.qcow2 > - > -Fedora-Cloud-Base-32-1.6.%.qcow2: > - $(WGET) -O $@ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/32/Cloud/$*/images/Fedora-Cloud-Base-32-1.6.$*.qcow2 > - > -Fedora-Cloud-Base-33-1.2.%.qcow2: > - $(WGET) -O $@ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/33/Cloud/$*/images/Fedora-Cloud-Base-33-1.2.$*.qcow2 > - > -Fedora-Cloud-Base-34-1.2.%.qcow2: > - $(WGET) -O $@ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/34/Cloud/$*/images/Fedora-Cloud-Base-34-1.2.$*.qcow2 > - > -Fedora-Cloud-Base-35-1.2.%.qcow2: > - $(WGET) -O $@ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Cloud/$*/images/Fedora-Cloud-Base-35-1.2.$*.qcow2 > - > -# OpenSuSE downloads > -openSUSE-Leap-15.1-JeOS.x86_64-kvm-and-xen.qcow2: > - $(WGET) -O $@ https://download.opensuse.org/distribution/leap/15.1/jeos/openSUSE-Leap-15.1-JeOS.x86_64-kvm-and-xen.qcow2 > - > -openSUSE-Leap-15.2-JeOS.x86_64-kvm-and-xen.qcow2: > - $(WGET) -O $@ https://download.opensuse.org/distribution/leap/15.2/appliances/openSUSE-Leap-15.2-JeOS.x86_64-kvm-and-xen.qcow2 > - > -openSUSE-Leap-15.3-JeOS.x86_64-kvm-and-xen.qcow2: > - $(WGET) -O $@ https://download.opensuse.org/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-kvm-and-xen.qcow2 > - > -openSUSE-Tumbleweed-ARM-JeOS-efi.aarch64.raw.xz: > - $(WGET) -O $@ http://download.opensuse.org/ports/aarch64/tumbleweed/appliances/openSUSE-Tumbleweed-ARM-JeOS-efi.aarch64.raw.xz > - > -openSUSE-Tumbleweed-ARM-JeOS-efi.armv7l.raw.xz: > - $(WGET) -O $@ http://download.opensuse.org/ports/armv7hl/tumbleweed/appliances/openSUSE-Tumbleweed-ARM-JeOS-efi.armv7l.raw.xz > - > -# Ubuntu downloads > -trusty-server-cloudimg-%-disk1.img: > - $(WGET) -O $@ https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-$*-disk1.img > - > -xenial-server-cloudimg-powerpc-disk1.img: > - $(WGET) -O $@ https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-powerpc-disk1.img > - > -jammy-server-cloudimg-s390x.img: > - $(WGET) -O $@ https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-s390x.img > -- > 2.47.0 > -- David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson