Merge pull request #146379 from rail/blathers/backport-release-25.2-146366

github-actions[bot] · web-flow · commit b99dcdbbd604 · 2025-05-09T20:02:41.000Z
release-25.2: build: remove ssh key on exit only on TeamCity agents
diff --git a/build/teamcity-support.sh b/build/teamcity-support.sh
@@ -12,7 +12,8 @@ source "$root/build/teamcity-common-support.sh"
 source "$root/build/teamcity/util.sh"
 
 remove_files_on_exit() {
-  rm -f ~/.ssh/id_rsa{,.pub}
+  # Remove the ssh key on exit only on TeamCity agents, not on the local machine.
+  rm -f ~agent/.ssh/id_rsa{,.pub}
   common_support_remove_files_on_exit
 }
 trap remove_files_on_exit EXIT

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ source "$root/build/teamcity-common-support.sh"`
`12`	`12`	`source "$root/build/teamcity/util.sh"`
`13`	`13`
`14`	`14`	`remove_files_on_exit() {`
`15`		`- rm -f ~/.ssh/id_rsa{,.pub}`
	`15`	`+ # Remove the ssh key on exit only on TeamCity agents, not on the local machine.`
	`16`	`+ rm -f ~agent/.ssh/id_rsa{,.pub}`
`16`	`17`	`common_support_remove_files_on_exit`
`17`	`18`	`}`
`18`	`19`	`trap remove_files_on_exit EXIT`