test: use --mount instead of --volume

Looks like we hit a Podman bug.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2019-09-19 14:01:20 +02:00
parent 03cdb6f9a5
commit b432209ed4
2 changed files with 5 additions and 5 deletions

View file

@ -7,19 +7,19 @@ load helpers
d=$(mktemp -d) d=$(mktemp -d)
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]] [[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]]
# get the number of the last line # get the number of the last line
n=$(expr ${#lines[@]} - 1) n=$(expr ${#lines[@]} - 1)
[[ ${lines[${n}]} =~ "[SrcImg][INFO] copied to oci:/output:latest-source" ]] [[ ${lines[${n}]} =~ "[SrcImg][INFO] copied to oci:/output:latest-source" ]]
echo "${d}" echo "${d}"
[ -f "${d}/index.json" ] [ -f "${d}/index.json" ]
[ -f "${d}/oci-layout" ] [ -f "${d}/oci-layout" ]
[ "$(du -b ${d}/index.json | awk '{ print $1 }')" -gt 0 ] [ "$(du -b ${d}/index.json | awk '{ print $1 }')" -gt 0 ]
[ "$(du -b ${d}/oci-layout | awk '{ print $1 }')" -gt 0 ] [ "$(du -b ${d}/oci-layout | awk '{ print $1 }')" -gt 0 ]
# let's press that the files are predictable # let's press that the files are predictable
[ "$(find ${d} -type f | wc -l)" -eq 7 ] [ "$(find ${d} -type f | wc -l)" -eq 7 ]
[ -f "${d}/blobs/sha256/3afb43699ea82a69b16efb215363604d9e4ffe16c9ace7e53df66663847309cf" ] [ -f "${d}/blobs/sha256/3afb43699ea82a69b16efb215363604d9e4ffe16c9ace7e53df66663847309cf" ]
@ -32,7 +32,7 @@ load helpers
d=$(mktemp -d) d=$(mktemp -d)
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
run_ctr -v $(pwd)/.testprep/srpms/:/src:ro -v ${d}:/output/ $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src -p oci:/output/pushed-image:latest-source
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
run ls ${d}/pushed-image run ls ${d}/pushed-image

View file

@ -8,7 +8,7 @@ load helpers
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
ref="registry.fedoraproject.org/fedora-minimal" ref="registry.fedoraproject.org/fedora-minimal"
run_ctr -v ${d}:/output/ $CTR_IMAGE -i "${ref}" run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}"
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
#echo ${lines[@]} #echo ${lines[@]}
[[ ${lines[0]} =~ "Getting image source signatures" ]] [[ ${lines[0]} =~ "Getting image source signatures" ]]