diff options
| author | Ed Santiago <santiago@redhat.com> | 2021-02-23 09:50:46 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2021-02-24 15:09:58 -0700 |
| commit | bee21f1e42a36622c9694e7d3a03ad40d0ebd04b (patch) | |
| tree | ea5c7808fac4226f7349b984c991c3600e6ccbaa /test/system/030-run.bats | |
| parent | 49fa19dff6717e419ebbaba029e84cbc5bd97904 (diff) | |
| download | podman-bee21f1e42a36622c9694e7d3a03ad40d0ebd04b.tar.gz podman-bee21f1e42a36622c9694e7d3a03ad40d0ebd04b.tar.bz2 podman-bee21f1e42a36622c9694e7d3a03ad40d0ebd04b.zip | |
system test image: build it multiarch
buildah now supports running under emulation[1] as well as
creating manifests. Use those features to create a multiarch
testimage that can be used to test podman on other arches.
[1] on Fedora 33, this requires the qemu-user-static package
We also build a new :00000001 image, replacing :00000000,
because (sigh) some tests try to run 'true' in the container.
Include instructions on building said image.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/030-run.bats')
| -rw-r--r-- | test/system/030-run.bats | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 93449ece9..b2999a9e7 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -139,7 +139,7 @@ echo $rand | 0 | $rand is "$output" "" "--pull=never [present]: no output" # Now test with a remote image which we don't have present (the 00 tag) - NONLOCAL_IMAGE="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:00000000" + NONLOCAL_IMAGE="$PODMAN_NONLOCAL_IMAGE_FQN" run_podman 125 run --pull=never $NONLOCAL_IMAGE true is "$output" "Error: unable to find a name and tag match for $NONLOCAL_IMAGE in repotags: no such image" "--pull=never [with image not present]: error" @@ -175,7 +175,7 @@ echo $rand | 0 | $rand # 'run --rmi' deletes the image in the end unless it's used by another container @test "podman run --rmi" { # Name of a nonlocal image. It should be pulled in by the first 'run' - NONLOCAL_IMAGE="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/$PODMAN_TEST_IMAGE_NAME:00000000" + NONLOCAL_IMAGE="$PODMAN_NONLOCAL_IMAGE_FQN" run_podman 1 image exists $NONLOCAL_IMAGE # Run a container, without --rm; this should block subsequent --rmi |