X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fjjb-cleanup.sh;fp=shell%2Fjjb-cleanup.sh;h=69d1534bb176a4ca32c950692f62e6db01e8a8ca;hb=fa92cd4118bf1ec02ec93327fcfda2325b7c9106;hp=9f3536a3c406d96e3d35ba003c9cdbd797fa8458;hpb=5957fbdd1eb1c38af3cf59fffedf8ebe1060d196;p=releng%2Fglobal-jjb.git

diff --git a/shell/jjb-cleanup.sh b/shell/jjb-cleanup.sh
index 9f3536a3..69d1534b 100644
--- a/shell/jjb-cleanup.sh
+++ b/shell/jjb-cleanup.sh
@@ -20,7 +20,8 @@ set -e -o pipefail
 # shellcheck source="$WORKSPACE/.jjb.properties" disable=SC1091
 source "$WORKSPACE/.jjb.properties"
 if [[ -n "$JJB_VENV" && "$JJB_VENV" =~ /tmp/.* ]]; then
-    rm -r "$JJB_VENV" && echo "$JJB_VENV removed"
+    rm -rf "$JJB_VENV" && echo "$JJB_VENV removed"
     unset JJB_VENV
 fi
-rm "$WORKSPACE/.jjb.properties"
+rm -f "$WORKSPACE/.jjb.properties"
+deactivate