mirror of
https://passt.top/passt
synced 2024-12-21 21:25:23 +00:00
test: Build and download podman as a test asset
The pasta_podman/bats test scrpt downloads and builds podman, then runs its pasta specific tests. Downloading from within a test case has some drawbacks: * It can be very tedious if you have poor connectivity to the server * It makes a test that's ostensibly for pasta itself dependent on the state of the github server * It precludes runnning the tests in an isolated network environment The same concerns largely apply to building podman too, because it's pretty common for Go builds to download dependencies themselves. Therefore move the download and build of podman from the test itself, to the Makefile where we prepare other test assets. To avoid cryptic failures if something went wrong with the build, make running the test dependent on having the built podman binary. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
parent
e8b78217bb
commit
f9fe3ae5dd
1
test/.gitignore
vendored
1
test/.gitignore
vendored
@ -1,5 +1,6 @@
|
||||
test_logs/
|
||||
mbuto/
|
||||
podman/
|
||||
*.img
|
||||
QEMU_EFI.fd
|
||||
*.qcow2
|
||||
|
@ -52,10 +52,10 @@ UBUNTU_NEW_IMGS = xenial-server-cloudimg-powerpc-disk1.img \
|
||||
jammy-server-cloudimg-s390x.img
|
||||
UBUNTU_IMGS = $(UBUNTU_OLD_IMGS) $(UBUNTU_NEW_IMGS)
|
||||
|
||||
DOWNLOAD_ASSETS = mbuto \
|
||||
DOWNLOAD_ASSETS = mbuto podman \
|
||||
$(DEBIAN_IMGS) $(FEDORA_IMGS) $(OPENSUSE_IMGS) $(UBUNTU_IMGS)
|
||||
TESTDATA_ASSETS = small.bin big.bin medium.bin
|
||||
LOCAL_ASSETS = mbuto.img mbuto.mem.img QEMU_EFI.fd \
|
||||
LOCAL_ASSETS = mbuto.img mbuto.mem.img podman/bin/podman QEMU_EFI.fd \
|
||||
$(DEBIAN_IMGS:%=prepared-%) $(FEDORA_IMGS:%=prepared-%) \
|
||||
$(UBUNTU_NEW_IMGS:%=prepared-%) \
|
||||
nstool guest-key guest-key.pub \
|
||||
@ -76,6 +76,14 @@ mbuto:
|
||||
|
||||
mbuto/mbuto: pull-mbuto
|
||||
|
||||
podman:
|
||||
git clone https://github.com/containers/podman.git
|
||||
|
||||
# To succesfully build podman, you will need gpgme and systemd
|
||||
# development packages
|
||||
podman/bin/podman: pull-podman
|
||||
$(MAKE) -C podman
|
||||
|
||||
guest-key guest-key.pub:
|
||||
ssh-keygen -f guest-key -N ''
|
||||
|
||||
|
@ -11,11 +11,9 @@
|
||||
# Copyright (c) 2022 Red Hat GmbH
|
||||
# Author: Stefano Brivio <sbrivio@redhat.com>
|
||||
|
||||
htools git make go bats catatonit ip jq socat
|
||||
htools git make go bats catatonit ip jq socat ./test/podman/bin/podman
|
||||
|
||||
test Podman system test with bats
|
||||
|
||||
host git -C __STATEDIR__ clone https://github.com/containers/podman.git
|
||||
host make -C __STATEDIR__/podman
|
||||
hout WD pwd
|
||||
host PODMAN="__STATEDIR__/podman/bin/podman" CONTAINERS_HELPER_BINARY_DIR="__WD__" bats __STATEDIR__/podman/test/system/505-networking-pasta.bats
|
||||
host PODMAN="test/podman/bin/podman" CONTAINERS_HELPER_BINARY_DIR="__WD__" bats test/podman/test/system/505-networking-pasta.bats
|
||||
|
Loading…
Reference in New Issue
Block a user