From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: Cleber Rosa <crosa@redhat.com>,
jarichte@redhat.com, David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v3 02/20] avocado: Don't double download assets for test/ and oldtest/
Date: Wed, 31 May 2023 11:58:31 +1000 [thread overview]
Message-ID: <20230531015849.3229596-3-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230531015849.3229596-1-david@gibson.dropbear.id.au>
oldtest/ is a snapshot of test/ for comparison purposes. However this
means its Makefile will make an additional download of everything we
download in test/, which takes rather a lot of space.
Alter oldtest/Makefile to re-use the downloads from test/ via symlinks.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
oldtest/.gitignore | 2 +-
oldtest/Makefile | 94 +++-------------------------------------------
2 files changed, 6 insertions(+), 90 deletions(-)
diff --git a/oldtest/.gitignore b/oldtest/.gitignore
index 4837402..2652ce7 100644
--- a/oldtest/.gitignore
+++ b/oldtest/.gitignore
@@ -1,5 +1,5 @@
test_logs/
-mbuto/
+mbuto
*.img
QEMU_EFI.fd
*.qcow2
diff --git a/oldtest/Makefile b/oldtest/Makefile
index 7b00bef..7949ced 100644
--- a/oldtest/Makefile
+++ b/oldtest/Makefile
@@ -67,9 +67,6 @@ CFLAGS = -Wall -Werror -Wextra -pedantic -std=c99
assets: $(ASSETS)
-mbuto:
- git clone git://mbuto.sh/mbuto
-
guest-key guest-key.pub:
ssh-keygen -f guest-key -N ''
@@ -113,91 +110,10 @@ clean:
rm -f $(LOCAL_ASSETS)
rm -rf test_logs
rm -f prepared-*.qcow2 prepared-*.img
-
-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-9-nocloud-%-daily-20200210-166.qcow2:
- $(WGET) -O $@ https://cloud.debian.org/images/cloud/stretch/daily/20200210-166/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
-
-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
-
-openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2:
- $(WGET) -O $@ https://download.opensuse.org/tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2
-
-# 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
+# "Downloads"
+$(DOWNLOAD_ASSETS): %:
+#debian-%.qcow2 Fedora-%.qcow2 openSUSE-%.qcow2 openSUSE-%.raw.xz trusty-%.img xenial-%.img jammy-%.img:
+ $(MAKE) -C ../test $@
+ ln -s ../test/$@ $@
--
@@ -67,9 +67,6 @@ CFLAGS = -Wall -Werror -Wextra -pedantic -std=c99
assets: $(ASSETS)
-mbuto:
- git clone git://mbuto.sh/mbuto
-
guest-key guest-key.pub:
ssh-keygen -f guest-key -N ''
@@ -113,91 +110,10 @@ clean:
rm -f $(LOCAL_ASSETS)
rm -rf test_logs
rm -f prepared-*.qcow2 prepared-*.img
-
-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-9-nocloud-%-daily-20200210-166.qcow2:
- $(WGET) -O $@ https://cloud.debian.org/images/cloud/stretch/daily/20200210-166/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
-
-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
-
-openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2:
- $(WGET) -O $@ https://download.opensuse.org/tumbleweed/appliances/openSUSE-Tumbleweed-JeOS.x86_64-kvm-and-xen.qcow2
-
-# 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
+# "Downloads"
+$(DOWNLOAD_ASSETS): %:
+#debian-%.qcow2 Fedora-%.qcow2 openSUSE-%.qcow2 openSUSE-%.raw.xz trusty-%.img xenial-%.img jammy-%.img:
+ $(MAKE) -C ../test $@
+ ln -s ../test/$@ $@
--
2.40.1
next prev parent reply other threads:[~2023-05-31 1:58 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 1:58 [PATCH v3 00/20] RFCv3: Proof-of-concept conversion of some tests to Avocado framework David Gibson
2023-05-30 23:59 ` [PATCH v3 01/20] avocado: Make a duplicate copy of testsuite for comparison purposes David Gibson
2023-05-31 1:58 ` David Gibson [this message]
2023-05-31 1:58 ` [PATCH v3 03/20] avocado: Move static checkers to avocado David Gibson
2023-05-31 1:58 ` [PATCH v3 04/20] avocado/tasst: Helper functions for executing commands in different places David Gibson
2023-05-31 1:58 ` [PATCH v3 05/20] avocado/tasst: Type checking helpers David Gibson
2023-05-31 1:58 ` [PATCH v3 06/20] avocado: Convert build tests to avocado David Gibson
2023-05-31 1:58 ` [PATCH v3 07/20] avocado/tasst: Add helpers for running background commands on sites David Gibson
2023-05-31 1:58 ` [PATCH v3 08/20] avocado/tasst: Add helper to get network interface names for a site David Gibson
2023-05-31 1:58 ` [PATCH v3 09/20] avocado/tasst: Add helpers to run commands with nstool David Gibson
2023-05-31 1:58 ` [PATCH v3 10/20] avocado/tasst: Add ifup and network address helpers to Site David Gibson
2023-05-31 1:58 ` [PATCH v3 11/20] avocado/tasst: Helper for creating veth devices between namespaces David Gibson
2023-05-31 1:58 ` [PATCH v3 12/20] avocado/tasst: Add helper for getting MTU of a network interface David Gibson
2023-05-31 1:58 ` [PATCH v3 13/20] avocado/tasst: Add helper to wait for IP address to appear David Gibson
2023-05-31 1:58 ` [PATCH v3 14/20] avocado/tasst: Add helpers for getting a site's routes David Gibson
2023-05-31 1:58 ` [PATCH v3 15/20] avocado/tasst: Helpers for test transferring data between sites David Gibson
2023-05-31 1:58 ` [PATCH v3 16/20] avocado/tasst: IP address allocation helpers David Gibson
2023-05-31 1:58 ` [PATCH v3 17/20] avocado/tasst: Helpers for testing NDP behaviour David Gibson
2023-05-31 1:58 ` [PATCH v3 18/20] avocado/tasst: Helpers for testing DHCP & DHCPv6 behaviour David Gibson
2023-05-31 1:58 ` [PATCH v3 19/20] avocado/tasst: Helpers to construct a simple network environment for tests David Gibson
2023-05-31 1:58 ` [PATCH v3 20/20] avocado: Convert basic pasta tests David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230531015849.3229596-3-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=crosa@redhat.com \
--cc=jarichte@redhat.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).