From 727259142561db3909f312de4474f4fe6465c6b3 Mon Sep 17 00:00:00 2001
From: "Gibbs, Ian" <gibbsib@ornl.gov>
Date: Mon, 18 Aug 2025 17:00:57 +0000
Subject: [PATCH] bugfix, cleanup zombie ssh-agent processes

---
 .gitlab-ci.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f83360..eaab5a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -409,11 +409,18 @@ job_publish_release:
       ls -lah ./rpmbuild/SRPMS
 
     # This section deals with ssh keys
-    - eval "$(ssh-agent -s)"
+    - |
+      . <(ssh-agent -s)
     - echo "chmod 600 ${xv6_rsa}"
     - chmod 600 "${xv6_rsa}"
     - ssh-add "${xv6_rsa}"
     - ssh-add -L
+
+    #
+    # set up a trap to kill ssh-agent on exit
+    #
+    - trap 'test -n "$SSH_AGENT_PID" && . <(ssh-agent -k)' 0
+
     - mkdir -p ~/.ssh && touch ~/.ssh/known_hosts
     # Remove the old key(s) from known_hosts
     - ssh-keygen -t rsa -R snspackages.ornl.gov
-- 
GitLab