containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixups for baseline test script 

Small amount of clean up on the baseline script to handle failing
on error.  I also added an option to not use docker at all for platoforms
where docker cannot be installed.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #1411
Approved by: rhatdan
This commit is contained in:
baude 2018-09-05 13:49:56 -05:00 committed by Atomic Bot
parent dc025819f4
commit a6811c89fc
1 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
test/test_podman_baseline.sh
View File

@ -11,6 +11,7 @@
# To run this command: # To run this command:
# #
# /bin/bash -v test_podman_baseline.sh -d # Install and then deinstall Docker # /bin/bash -v test_podman_baseline.sh -d # Install and then deinstall Docker
# /bin/bash -v test_podman_baseline.sh -n # Do not perform docker test
# /bin/bash -v test_podman_baseline.sh -e # Stop on error # /bin/bash -v test_podman_baseline.sh -e # Stop on error
# /bin/bash -v test_podman_baseline.sh # Continue on error # /bin/bash -v test_podman_baseline.sh # Continue on error
# #
@ -20,16 +21,19 @@
####### #######
showerror=0 showerror=0
installdocker=0 installdocker=0
while getopts "de" opt; do usedocker=1
while getopts "den" opt; do
case "$opt" in case "$opt" in
d) installdocker=1 d) installdocker=1
;; ;;
e) showerror=1 e) showerror=1
;; ;;
n) usedocker=0
;;
esac esac
done done
if [ "$installdocker" -eq 1 ] if [ "$installdocker" -eq 1 ] && [ "usedocker" -ne 0 ]
then then
echo "Script will install and then deinstall Docker." echo "Script will install and then deinstall Docker."
fi fi
@ -37,7 +41,7 @@ fi
if [ "$showerror" -eq 1 ] if [ "$showerror" -eq 1 ]
then then
echo "Script will stop on unexpected errors." echo "Script will stop on unexpected errors."
set -eu set -e
fi fi
pkg_manager=`command -v dnf` pkg_manager=`command -v dnf`
@ -92,7 +96,7 @@ podman rm --all
podman run --net=host $image dnf -y install java podman run --net=host $image dnf -y install java
javaimage=$(podman ps --all -q) javaimage=$(podman ps --all -q)
podman commit $javaimage javaimage podman commit $javaimage javaimage
podman run javaimage java podman run javaimage java -version
######## ########
# Cleanup containers and images # Cleanup containers and images
@ -151,31 +155,33 @@ podman images
######## ########
podman rm -a podman rm -a
if [ "$installdocker" -eq 1 ] if [ "$usedocker" -ne 0 ]; then
then if [ "$installdocker" -eq 1 ]
######## then
# Install Docker, but not for long! ########
######## # Install Docker, but not for long!
$package_manager -y install docker ########
fi $package_manager -y install docker
systemctl restart docker fi
systemctl restart docker
########
# Push fedora-bashecho to the Docker daemon
########
podman push runecho docker-daemon:fedora-bashecho:latest
########
# Run fedora-bashecho pull Docker
########
docker run fedora-bashecho ./tmp/runecho.sh
if [ "$installdocker" -eq 1 ]
then
######## ########
# Time to remove Docker # Push fedora-bashecho to the Docker daemon
######## ########
$package_manager -y remove docker podman push runecho docker-daemon:fedora-bashecho:latest
########
# Run fedora-bashecho pull Docker
########
docker run fedora-bashecho ./tmp/runecho.sh
if [ "$installdocker" -eq 1 ]
then
########
# Time to remove Docker
########
$package_manager -y remove docker
fi
fi fi
######## ########
@ -213,13 +219,16 @@ fi
######## ########
# Expected to fail # Expected to fail
######## ########
podman $PODMANBASE run --security-opt label=disable alpine sh -c 'touch file.txt && dd if=/dev/zero of=file.txt count=1048577 bs=1'
rc=$? if [ "$showerror" -ne 1 ]; then
if [ $rc != 0 ]; podman $PODMANBASE run --security-opt label=disable alpine sh -c 'touch file.txt && dd if=/dev/zero of=file.txt count=1048577 bs=1'
then rc=$?
echo "Overlay test outside limits passed" if [ $rc != 0 ];
else then
echo "Overlay test outside limits failed" echo "Overlay test outside limits passed"
else
echo "Overlay test outside limits failed"
fi
fi fi
######## ########