New test: Verify tar images with Docker and systemd-nspawn
- on some arches (also Fedora x86_64) systemd-nspawn may not be
available
- delete composes from other tests in rlPhaseStartCleanup because
we're seeing the tar compose kind of hanging in Jenkins and that
test script is executed last so the slave may be running out of
disk space. Be a good citizen and clean up after the previous
tests.
(cherry picked from commit ea78cce882
)
This commit is contained in:
parent
b7b8731c03
commit
ce361d6f48
3
Makefile
3
Makefile
@ -51,7 +51,8 @@ test:
|
|||||||
# but even so fails in Travis CI
|
# but even so fails in Travis CI
|
||||||
test_images:
|
test_images:
|
||||||
sudo -E ./tests/test_cli.sh tests/cli/test_compose_ext4-filesystem.sh \
|
sudo -E ./tests/test_cli.sh tests/cli/test_compose_ext4-filesystem.sh \
|
||||||
tests/cli/test_compose_partitioned-disk.sh
|
tests/cli/test_compose_partitioned-disk.sh \
|
||||||
|
tests/cli/test_compose_tar.sh
|
||||||
|
|
||||||
test_aws:
|
test_aws:
|
||||||
sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_aws.sh
|
sudo -E ./tests/test_cli.sh tests/cli/test_build_and_deploy_aws.sh
|
||||||
|
@ -34,5 +34,9 @@ rlJournalStart
|
|||||||
fi
|
fi
|
||||||
rlPhaseEnd
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun -t -c "$CLI compose delete $UUID"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
rlJournalEnd
|
rlJournalEnd
|
||||||
rlJournalPrintText
|
rlJournalPrintText
|
||||||
|
@ -34,5 +34,9 @@ rlJournalStart
|
|||||||
fi
|
fi
|
||||||
rlPhaseEnd
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun -t -c "$CLI compose delete $UUID"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
rlJournalEnd
|
rlJournalEnd
|
||||||
rlJournalPrintText
|
rlJournalPrintText
|
||||||
|
68
tests/cli/test_compose_tar.sh
Executable file
68
tests/cli/test_compose_tar.sh
Executable file
@ -0,0 +1,68 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# Note: execute this file from the project root directory
|
||||||
|
|
||||||
|
#####
|
||||||
|
#
|
||||||
|
# Builds tar images and tests them with Docker and systemd-nspawn
|
||||||
|
#
|
||||||
|
#####
|
||||||
|
|
||||||
|
. /usr/share/beakerlib/beakerlib.sh
|
||||||
|
|
||||||
|
CLI="./src/bin/composer-cli"
|
||||||
|
|
||||||
|
|
||||||
|
rlJournalStart
|
||||||
|
rlPhaseStartSetup
|
||||||
|
rlAssertExists /usr/bin/docker
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "compose start"
|
||||||
|
rlAssertEquals "SELinux operates in enforcing mode" "$(getenforce)" "Enforcing"
|
||||||
|
UUID=`$CLI compose start example-http-server tar`
|
||||||
|
rlAssertEquals "exit code should be zero" $? 0
|
||||||
|
|
||||||
|
UUID=`echo $UUID | cut -f 2 -d' '`
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "compose finished"
|
||||||
|
if [ -n "$UUID" ]; then
|
||||||
|
until $CLI compose info $UUID | grep FINISHED; do
|
||||||
|
sleep 10
|
||||||
|
rlLogInfo "Waiting for compose to finish ..."
|
||||||
|
done;
|
||||||
|
else
|
||||||
|
rlFail "Compose UUID is empty!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rlRun -t -c "$CLI compose image $UUID"
|
||||||
|
IMAGE="$UUID-root.tar.xz"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "Verify tar image with Docker"
|
||||||
|
rlRun -t -c "docker import $IMAGE composer/$UUID:latest"
|
||||||
|
|
||||||
|
# verify we can run a container with this image
|
||||||
|
rlRun -t -c "docker run -it --rm --entrypoint /usr/bin/cat composer/$UUID /etc/redhat-release"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartTest "Verify tar image with systemd-nspawn"
|
||||||
|
if [ -f /usr/bin/systemd-nspawn ]; then
|
||||||
|
NSPAWN_DIR=`mktemp -d /tmp/nspawn.XXXX`
|
||||||
|
rlRun -t -c "tar -xJvf $IMAGE -C $NSPAWN_DIR"
|
||||||
|
|
||||||
|
# verify we can run a container with this image
|
||||||
|
rlRun -t -c "systemd-nspawn -D $NSPAWN_DIR cat /etc/redhat-release"
|
||||||
|
else
|
||||||
|
rlLogInfo "systemd-nspawn not found!"
|
||||||
|
fi
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlPhaseStartCleanup
|
||||||
|
rlRun -t -c "rm -rf $IMAGE $NSPAWN_DIR"
|
||||||
|
rlRun -t -c "$CLI compose delete $UUID"
|
||||||
|
rlRun -t -c "docker rmi composer/$UUID"
|
||||||
|
rlPhaseEnd
|
||||||
|
|
||||||
|
rlJournalEnd
|
||||||
|
rlJournalPrintText
|
Loading…
Reference in New Issue
Block a user