diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/buildah-bud/buildah-tests.diff | 10 | ||||
| -rwxr-xr-x | test/buildah-bud/run-buildah-bud-tests | 5 | ||||
| -rw-r--r-- | test/system/070-build.bats | 22 |
3 files changed, 20 insertions, 17 deletions
diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index fb00ddebf..1c8592f7f 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -1,4 +1,4 @@ -From 90c93048c9f3bdedf39c3c5ce3216ee2518220b4 Mon Sep 17 00:00:00 2001 +From a00508656599b24776982996fdb44d4874338fd4 Mon Sep 17 00:00:00 2001 From: Ed Santiago <santiago@redhat.com> Date: Tue, 9 Feb 2021 17:28:05 -0700 Subject: [PATCH] tweaks for running buildah tests under podman @@ -9,10 +9,10 @@ Signed-off-by: Ed Santiago <santiago@redhat.com> 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/helpers.bash b/tests/helpers.bash -index b85f99d3..1a827cd7 100644 +index 11deb367..08e73954 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash -@@ -147,15 +147,37 @@ function run_buildah() { +@@ -164,15 +164,37 @@ function run_buildah() { --retry) retry=3; shift;; # retry network flakes esac @@ -47,9 +47,9 @@ index b85f99d3..1a827cd7 100644 # 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} ${BUILDAH_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" +- run env CONTAINERS_CONF=${CONTAINERS_CONF:-$(dirname ${BASH_SOURCE})/containers.conf} timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${BUILDAH_BINARY} ${BUILDAH_REGISTRY_OPTS} ${ROOTDIR_OPTS} "$@" + echo "\$ $cmd_basename $*" -+ run timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${podman_or_buildah} ${registry_opts} ${ROOTDIR_OPTS} "$@" ++ run env CONTAINERS_CONF=${CONTAINERS_CONF:-$(dirname ${BASH_SOURCE})/containers.conf} timeout --foreground --kill=10 $BUILDAH_TIMEOUT ${podman_or_buildah} ${registry_opts} ${ROOTDIR_OPTS} "$@" # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index b08b854ee..a37e90dc4 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -145,9 +145,11 @@ if [[ -n $do_checkout ]]; then # the set of patches (set -x;git tag $BASE_TAG) - # Build buildah + # Build buildah and the copy helper failhint="error building buildah. This should never happen." (set -x;make bin/buildah) + failhint="error building buildah's copy helper. This should never happen." + (set -x;make bin/copy) # The upcoming patch may fail. Before we try it, create a helper script # for a developer to push a new set of diffs to podman-land. @@ -213,5 +215,6 @@ review the test failure and double-check your changes. (set -x;sudo env TMPDIR=/var/tmp \ PODMAN_BINARY=$PODMAN_BINARY \ BUILDAH_BINARY=$(pwd)/bin/buildah \ + COPY_BINARY=$(pwd)/bin/copy \ bats "${bats_filter[@]}" tests/bud.bats) fi diff --git a/test/system/070-build.bats b/test/system/070-build.bats index 6843e28a5..c45a661fe 100644 --- a/test/system/070-build.bats +++ b/test/system/070-build.bats @@ -21,7 +21,7 @@ EOF # The 'apk' command can take a long time to fetch files; bump timeout PODMAN_TIMEOUT=240 run_podman build -t build_test --format=docker $tmpdir - is "$output" ".*STEP 4: COMMIT" "COMMIT seen in log" + is "$output" ".*COMMIT" "COMMIT seen in log" run_podman run --rm build_test cat /$rand_filename is "$output" "$rand_content" "reading generated file in image" @@ -44,7 +44,7 @@ EOF # The 'apk' command can take a long time to fetch files; bump timeout PODMAN_TIMEOUT=240 run_podman build -t build_test -f - --format=docker $tmpdir < $containerfile - is "$output" ".*STEP 4: COMMIT" "COMMIT seen in log" + is "$output" ".*COMMIT" "COMMIT seen in log" run_podman run --rm build_test cat /$rand_filename is "$output" "$rand_content" "reading generated file in image" @@ -110,7 +110,7 @@ EOF # One of: ADD myfile /myfile or COPY . . run_podman build -t build_test -f $tmpdir/Dockerfile $tmpdir - is "$output" ".*STEP 3: COMMIT" "COMMIT seen in log" + is "$output" ".*COMMIT" "COMMIT seen in log" if [[ "$output" =~ "Using cache" ]]; then is "$output" "[no instance of 'Using cache']" "no cache used" fi @@ -124,7 +124,7 @@ EOF run tar -C $tmpdir -cJf $tmpdir/myfile.tar.xz subtest run_podman build -t build_test -f $tmpdir/Dockerfile $tmpdir - is "$output" ".*STEP 3: COMMIT" "COMMIT seen in log" + is "$output" ".*COMMIT" "COMMIT seen in log" # Since the tarfile is modified, podman SHOULD NOT use a cached layer. if [[ "$output" =~ "Using cache" ]]; then @@ -519,8 +519,8 @@ RUN mkdir $workdir WORKDIR $workdir RUN /bin/echo $random_echo EOF - is "$output" ".*STEP 5: COMMIT" "COMMIT seen in log" - is "$output" ".*STEP .: RUN /bin/echo $random_echo" + is "$output" ".*COMMIT" "COMMIT seen in log" + is "$output" ".*STEP .*: RUN /bin/echo $random_echo" run_podman run --rm build_test pwd is "$output" "$workdir" "pwd command in container" @@ -571,10 +571,10 @@ EOF if is_remote; then remote_extra=".*";fi expect="${random1} .* -STEP 1: FROM $IMAGE -STEP 2: RUN echo x${random2}y +STEP 1/2: FROM $IMAGE +STEP 2/2: RUN echo x${random2}y x${random2}y${remote_extra} -STEP 3: COMMIT build_test${remote_extra} +COMMIT build_test${remote_extra} --> [0-9a-f]\{11\} Successfully tagged localhost/build_test:latest [0-9a-f]\{64\} @@ -739,7 +739,7 @@ EOF run_podman build -t build_test --format=docker --logfile=$tmpdir/logfile $tmpbuilddir run cat $tmpdir/logfile - is "$output" ".*STEP 2: COMMIT" "COMMIT seen in log" + is "$output" ".*COMMIT" "COMMIT seen in log" run_podman rmi -f build_test } @@ -757,7 +757,7 @@ RUN cat /proc/self/attr/current EOF run_podman build -t build_test --security-opt label=level:s0:c3,c4 --format=docker $tmpbuilddir - is "$output" ".*s0:c3,c4STEP 3: COMMIT" "label setting level" + is "$output" ".*s0:c3,c4COMMIT" "label setting level" run_podman rmi -f build_test } |