chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(test): Properly kill salt-minion after running test

Browse Source
This commit is contained in:
Carlos Álvaro
2023-05-07 09:51:41 +02:00
committed by Carlos D. Álvaro
parent f5ef219434
commit 961b1c5e00
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/lib/common.sh
View File

@@ -47,14 +47,15 @@ function cleanup()
echo "🧹 Running cleanup tasks ..." echo "🧹 Running cleanup tasks ..."
local salt_master_container="$(docker container ls --filter NAME="${CONTAINER_NAME}" --quiet)" local salt_master_container="$(docker container ls --filter NAME="${CONTAINER_NAME}" --quiet)"
if [ -n "${salt_master_container}" ]; then if [[ -n "${salt_master_container}" ]]; then
echo " - Removing ${CONTAINER_NAME} docker container ..." echo " - Removing ${CONTAINER_NAME} docker container ..."
docker container rm --force --volumes "${salt_master_container}" > /dev/null docker container rm --force --volumes "${salt_master_container}" > /dev/null
fi fi
if [ -n "$(pgrep -f salt-minion)" ]; then local SALT_MINION_PIDS=$(pgrep -f salt-minion)
if [[ -n "${SALT_MINION_PIDS}" ]]; then
echo " - Stopping salt-minion ..." echo " - Stopping salt-minion ..."
sudo killall salt-minion sudo kill "${SALT_MINION_PIDS}"
sudo rm -f /var/log/salt/minion sudo rm -f /var/log/salt/minion
fi fi
@@ -113,7 +114,7 @@ function salt()
function container_log() function container_log()
{ {
local CONTAINER_ID="$(docker container ls --all --filter NAME="${CONTAINER_NAME}" --quiet)" local CONTAINER_ID="$(docker container ls --all --filter NAME="${CONTAINER_NAME}" --quiet)"
[ -n "${CONTAINER_ID}" ] || return 0 [[ -n "${CONTAINER_ID}" ]] || return 0
echo "📝 container log (${CONTAINER_NAME})" echo "📝 container log (${CONTAINER_NAME})"
docker logs -t "${CONTAINER_ID}" docker logs -t "${CONTAINER_ID}"
@@ -128,7 +129,7 @@ function master_log()
local LOGS_DIR="${SCRIPT_PATH}/logs" local LOGS_DIR="${SCRIPT_PATH}/logs"
local SALT_MASTER_LOG="${LOGS_DIR}/salt/master" local SALT_MASTER_LOG="${LOGS_DIR}/salt/master"
[ -f "${SALT_MASTER_LOG}" ] || return 0 [[ -f "${SALT_MASTER_LOG}" ]] || return 0
echo "📝 salt-master log (${SALT_MASTER_LOG})" echo "📝 salt-master log (${SALT_MASTER_LOG})"
sudo cat "${SALT_MASTER_LOG}" sudo cat "${SALT_MASTER_LOG}"
} }
@@ -141,7 +142,7 @@ function minion_log()
{ {
local SALT_MINION_LOG='/var/log/salt/minion' local SALT_MINION_LOG='/var/log/salt/minion'
[ -f "${SALT_MINION_LOG}" ] || return 0 [[ -f "${SALT_MINION_LOG}" ]] || return 0
echo "📝 salt-minion log (${SALT_MINION_LOG})" echo "📝 salt-minion log (${SALT_MINION_LOG})"
sudo cat "${SALT_MINION_LOG}" sudo cat "${SALT_MINION_LOG}"
} }