[PATCH 0/2] Update locations for some downloaded images

[PATCH 0/2] Update locations for some downloaded images

[David Gibson]

We're not running the distro tests by default at the moment, but the
Makefile still downloads and prepares the images for them.  I haven't
actually done the downloads for some time, because I kept the images
around, but I finally happened to do a full clean and needed to
re-download.

At this point I discovered some of the things we're trying to download
have moved, so some URLs need updating.

David Gibson (2):
  test: Update location for Debian ppc64 images
  test: Fedora 32-35 have moved to the archives

 test/Makefile      | 13 ++++++++-----
 test/distro/debian |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

-- 
2.39.1

[PATCH 1/2] test: Update location for Debian ppc64 images

[David Gibson]

The current debian cloud images no longer include ppc64.  Change to using
the latest snapshot which does include ppc64.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 test/Makefile      | 5 ++++-
 test/distro/debian | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 9f2bc42..2d170eb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -11,7 +11,7 @@ DEBIAN_IMGS = debian-8.11.0-openstack-amd64.qcow2 \
 	debian-9-nocloud-amd64-daily-20200210-166.qcow2 \
 	debian-10-nocloud-amd64.qcow2 \
 	debian-10-generic-arm64.qcow2 \
-	debian-10-generic-ppc64el.qcow2 \
+	debian-10-generic-ppc64el-20220911-1135.qcow2 \
 	debian-11-nocloud-amd64.qcow2 \
 	debian-11-generic-arm64.qcow2 \
 	debian-11-generic-ppc64el.qcow2 \
@@ -127,6 +127,9 @@ debian-9-nocloud-%-daily-20200210-166.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
 
diff --git a/test/distro/debian b/test/distro/debian
index 5633c22..08cfe05 100644
--- a/test/distro/debian
+++ b/test/distro/debian
@@ -118,7 +118,7 @@ sleep	1
 
 test	Debian GNU/Linux 10 (buster, oldstable), ppc64le
 
-host	qemu-system-ppc64 -m 2048 -smp 2 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-10-generic-ppc64el.qcow2 -device virtio-net-pci,netdev=s0 -netdev stream,id=s0,server=off,addr.type=unix,addr.path=__STATEDIR__/passt.socket -snapshot
+host	qemu-system-ppc64 -m 2048 -smp 2 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-10-generic-ppc64el-20220911-1135.qcow2 -device virtio-net-pci,netdev=s0 -netdev stream,id=s0,server=off,addr.type=unix,addr.path=__STATEDIR__/passt.socket -snapshot
 host	PS1='$ '
 sleep	2
 host	apt-get update
-- 
@@ -118,7 +118,7 @@ sleep	1
 
 test	Debian GNU/Linux 10 (buster, oldstable), ppc64le
 
-host	qemu-system-ppc64 -m 2048 -smp 2 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-10-generic-ppc64el.qcow2 -device virtio-net-pci,netdev=s0 -netdev stream,id=s0,server=off,addr.type=unix,addr.path=__STATEDIR__/passt.socket -snapshot
+host	qemu-system-ppc64 -m 2048 -smp 2 -nographic -serial stdio -nodefaults -no-reboot -nographic -vga none __BASEPATH__/prepared-debian-10-generic-ppc64el-20220911-1135.qcow2 -device virtio-net-pci,netdev=s0 -netdev stream,id=s0,server=off,addr.type=unix,addr.path=__STATEDIR__/passt.socket -snapshot
 host	PS1='$ '
 sleep	2
 host	apt-get update
-- 
2.39.1

[PATCH 2/2] test: Fedora 32-35 have moved to the archives

[David Gibson]

Fedora 32-35 are now old enough that they're not on all mirrors.  Fetch
them from the archive server instead.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 test/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 2d170eb..1341677 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -162,16 +162,16 @@ 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://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux/releases/33/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux//releases/34/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/$*/images/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:
-- 
@@ -162,16 +162,16 @@ 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://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux/releases/33/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux//releases/34/Cloud/$*/images/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://download.fedoraproject.org/pub/fedora/linux/releases/35/Cloud/$*/images/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:
-- 
2.39.1

Re: [PATCH 0/2] Update locations for some downloaded images

[Stefano Brivio]

On Tue, 14 Feb 2023 10:37:11 +1100
David Gibson <david@gibson.dropbear.id.au> wrote:

> We're not running the distro tests by default at the moment, but the
> Makefile still downloads and prepares the images for them.  I haven't
> actually done the downloads for some time, because I kept the images
> around, but I finally happened to do a full clean and needed to
> re-download.
> 
> At this point I discovered some of the things we're trying to download
> have moved, so some URLs need updating.
> 
> David Gibson (2):
>   test: Update location for Debian ppc64 images
>   test: Fedora 32-35 have moved to the archives

Applied, thanks.

-- 
Stefano