From 3cc2fc9f5fdf520ecc955b9ab7bb8406c534d159 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Fri, 28 Feb 2020 14:45:42 -0700 Subject: [PATCH] qa/workunits/cephadm/test_cephadm.sh: add `cleanup` function moves logic for clean-up during `trap EXIT` into a function Signed-off-by: Michael Fritch --- qa/workunits/cephadm/test_cephadm.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index ec8c330a07d..15ed7f71475 100755 --- a/qa/workunits/cephadm/test_cephadm.sh +++ b/qa/workunits/cephadm/test_cephadm.sh @@ -11,7 +11,12 @@ IMAGE_NAUTILUS=${IMAGE_NAUTILUS:-'docker.io/ceph/daemon-base:latest-nautilus'} IMAGE_MIMIC=${IMAGE_MIMIC:-'docker.io/ceph/daemon-base:latest-mimic'} TMPDIR=$(mktemp -d) -trap "rm -rf $TMPDIR" EXIT + +function cleanup() +{ + rm -rf $TMPDIR +} +trap cleanup EXIT OSD_IMAGE_NAME="${SCRIPT_NAME%.*}_osd.img" OSD_IMAGE_SIZE='6G' -- 2.39.5