From 6ca12719612476bf0d40e10aa977eaf9176a1421 Mon Sep 17 00:00:00 2001 From: Alexandru Antone Date: Thu, 11 Jun 2020 16:52:48 +0300 Subject: [PATCH] Gracefully stop the remote-installer container Force killing the container with 'rm -f' bypasses the SIGTERM handler defined in the container's entry point shell script which would gracefully stop the nfs-server before exiting. This leaves TCP port 2049 bound on some hosts and subsequent runs of the remote-installer will fail to properly start NFS shares. Signed-off-by: Alexandru Antone Change-Id: I56d77ffabdb901504193c5e5d6b7d0f73d52488d --- jjb/shell/ta-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/jjb/shell/ta-install.sh b/jjb/shell/ta-install.sh index 7642978..4c197fa 100644 --- a/jjb/shell/ta-install.sh +++ b/jjb/shell/ta-install.sh @@ -60,6 +60,7 @@ _cleanup() { set +e sudo chown -R jenkins:jenkins "$WORKDIR" docker cp 'remote-installer':/var/log/remote-installer.log "$BASEDIR/" + docker stop 'remote-installer' docker rm -f 'remote-installer' trap - EXIT ERR HUP INT QUIT TERM exit $exit_status -- 2.16.6