From 47cc8f54d272039bdab389b29c8b2b5bb085e923 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 9 Feb 2021 17:28:05 -0700 Subject: [PATCH] tweaks for running buildah tests under podman Signed-off-by: Ed Santiago --- tests/bud.bats | 22 +++++++++++++--------- tests/helpers.bash | 28 ++++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/tests/bud.bats b/tests/bud.bats index fe3af27a..d1ccced5 100644 --- a/tests/bud.bats +++ b/tests/bud.bats @@ -4,7 +4,7 @@ load helpers @test "bud with a path to a Dockerfile (-f) containing a non-directory entry" { run_buildah 125 bud -f ${TESTSDIR}/bud/non-directory-in-path/non-directory/Dockerfile - expect_output --substring "non-directory/Dockerfile: not a directory" + expect_output --substring "Error: context must be a directory:" } @test "bud with --dns* flags" { @@ -117,6 +117,7 @@ symlink(subdir)" } @test "bud-flags-order-verification" { + skip "N/A under podman" run_buildah 125 bud /tmp/tmpdockerfile/ -t blabla check_options_flag_err "-t" @@ -1436,13 +1437,13 @@ function _test_http() { @test "bud with dir for file but no Dockerfile in dir" { target=alpine-image run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json -t ${target} -f ${TESTSDIR}/bud/empty-dir ${TESTSDIR}/bud/empty-dir - expect_output --substring "no such file or directory" + expect_output --substring "Error: context must be a directory:" } @test "bud with bad dir Dockerfile" { target=alpine-image run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json -t ${target} -f ${TESTSDIR}/baddirname ${TESTSDIR}/baddirname - expect_output --substring "no such file or directory" + expect_output --substring "Error: context must be a directory:" } @test "bud with ARG before FROM default value" { @@ -1913,6 +1914,7 @@ _EOF } @test "bud without any arguments should succeed" { + skip "does not work under podman" cd ${TESTSDIR}/bud/from-scratch run_buildah bud --signature-policy ${TESTSDIR}/policy.json } @@ -1920,7 +1922,7 @@ _EOF @test "bud without any arguments should fail when no Dockerfile exist" { cd $(mktemp -d) run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json - expect_output --substring "no such file or directory" + expect_output "Error: no context directory and no Containerfile specified" } @test "bud with specified context should fail if directory contains no Dockerfile" { @@ -1933,16 +1935,17 @@ _EOF DIR=$(mktemp -d) mkdir -p "$DIR"/Dockerfile run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json "$DIR" - expect_output --substring "is not a file" + expect_output --substring "Error: open .*: no such file or directory" } @test "bud with specified context should fail if context contains not-existing Dockerfile" { DIR=$(mktemp -d) run_buildah 125 bud --signature-policy ${TESTSDIR}/policy.json "$DIR"/Dockerfile - expect_output --substring "no such file or directory" + expect_output --substring "context must be a directory" } @test "bud with specified context should succeed if context contains existing Dockerfile" { + skip "podman requires a directory, not a Dockerfile" DIR=$(mktemp -d) echo "FROM alpine" > "$DIR"/Dockerfile run_buildah 0 bud --signature-policy ${TESTSDIR}/policy.json "$DIR"/Dockerfile @@ -1994,7 +1997,7 @@ _EOF @test "bud-squash-hardlinks" { _prefetch busybox - run_buildah bud --signature-policy ${TESTSDIR}/policy.json --squash ${TESTSDIR}/bud/layers-squash/Dockerfile.hardlinks + run_buildah bud --signature-policy ${TESTSDIR}/policy.json --squash -f Dockerfile.hardlinks ${TESTSDIR}/bud/layers-squash } @test "bud with additional directory of devices" { @@ -2159,6 +2162,7 @@ _EOF } @test "bud with Containerfile should fail with nonexistent authfile" { + skip "FIXME: podman issue #9572" target=alpine-image run_buildah 125 bud --authfile /tmp/nonexistent --signature-policy ${TESTSDIR}/policy.json -t ${target} ${TESTSDIR}/bud/containerfile } @@ -2286,6 +2290,7 @@ EOM } @test "bud with encrypted FROM image" { + skip "Too much effort to spin up a local registry" _prefetch busybox mkdir ${TESTDIR}/tmp openssl genrsa -out ${TESTDIR}/tmp/mykey.pem 1024 @@ -2358,8 +2363,6 @@ EOM _prefetch alpine run_buildah bud --timestamp=0 --quiet --pull=false --signature-policy ${TESTSDIR}/policy.json -t timestamp -f Dockerfile.1 ${TESTSDIR}/bud/cache-stages cid=$output - run_buildah inspect --format '{{ .Docker.Created }}' timestamp - expect_output --substring "1970-01-01" run_buildah inspect --format '{{ .OCIv1.Created }}' timestamp expect_output --substring "1970-01-01" run_buildah inspect --format '{{ .History }}' timestamp @@ -2619,6 +2622,7 @@ _EOF } @test "bud with --arch flag" { + skip "FIXME: for podman, emergency skip to get CI going" _prefetch alpine mytmpdir=${TESTDIR}/my-dir mkdir -p ${mytmpdir} diff --git a/tests/helpers.bash b/tests/helpers.bash index 99c290af..c5572840 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash @@ -70,7 +70,7 @@ function _prefetch() { mkdir -p ${_BUILDAH_IMAGE_CACHEDIR} fi - local _podman_opts="--root ${TESTDIR}/root --storage-driver ${STORAGE_DRIVER}" + local _podman_opts="--root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER}" for img in "$@"; do echo "# [checking for: $img]" >&2 @@ -138,15 +138,35 @@ function run_buildah() { --retry) retry=3; shift;; # retry network flakes esac + local podman_or_buildah=${BUILDAH_BINARY} + if [[ $1 == "bud" || $1 == "build-using-dockerfile" ]]; then + shift + # podman defaults to --layers=true; buildah to --false. + # If command line includes explicit --layers, leave it untouched, + # but otherwise update command line so podman mimics buildah default. + if [[ "$*" =~ --layers || "$*" =~ --squash ]]; then + set "build" "--force-rm=false" "$@" + else + set "build" "--force-rm=false" "--layers=false" "$@" + fi + podman_or_buildah=${PODMAN_BINARY} + + # podman always exits 125 where buildah exits 1 or 2 + case $expected_rc in + 1|2) expected_rc=125 ;; + esac + fi + local cmd_basename=$(basename ${podman_or_buildah}) + # Remember command args, for possible use in later diagnostic messages - MOST_RECENT_BUILDAH_COMMAND="buildah $*" + MOST_RECENT_BUILDAH_COMMAND="$cmd_basename $*" while [ $retry -gt 0 ]; do retry=$(( retry - 1 )) # stdout is only emitted upon error; this echo is to help a debugger - echo "\$ $BUILDAH_BINARY $*" - run timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${BUILDAH_BINARY} --registries-conf ${TESTSDIR}/registries.conf --root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER} "$@" + echo "\$ $cmd_basename $*" + run timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${podman_or_buildah} --registries-conf ${TESTSDIR}/registries.conf --root ${TESTDIR}/root --runroot ${TESTDIR}/runroot --storage-driver ${STORAGE_DRIVER} "$@" # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" -- 2.30.2