Skip to content

Revert "Update dependency org.jenkins-ci.plugins:ssh-agent to v417" - #7232

Merged
MarkEWaite merged 1 commit into
masterfrom
revert-7230-ssh-agent-417
Aug 9, 2026
Merged

Revert "Update dependency org.jenkins-ci.plugins:ssh-agent to v417"#7232
MarkEWaite merged 1 commit into
masterfrom
revert-7230-ssh-agent-417

Conversation

@darinpope

Copy link
Copy Markdown
Contributor

Rolling back to 402.vc9cec9230d4b_ for the same reason as #7205 and #7210: SSHAgentStepWorkflowTest.teardownDoesNotFailBuildWhenAgentAlreadyStopped still fails under PCT.

417 could not have fixed it. The 416..417 diff is a single commit, "fix: default ssh-agent timeout when loading legacy job configuration" (jenkinsci/ssh-agent-plugin#300), touching only SSHAgentBuildWrapper.java, ExecRemoteAgent.java, and a new SSHAgentBuildWrapperTimeoutTest.java. SSHAgentStepWorkflowTest.java is byte-identical between the two tags (blob 8b2e0c73836b50ec79b58e6c5b12aed18fe608bb).

Reproduced locally against a megawar built from this repo at 417.v1d50b_f28f0e0, run in a container whose PID 1 does not reap:

[ERROR] Tests run: 45, Failures: 1, Errors: 0, Skipped: 1
[ERROR] SSHAgentStepWorkflowTest.teardownDoesNotFailBuildWhenAgentAlreadyStopped:112
Expected: a string containing "Failed to run ssh-agent -k"
but: was "... $ ssh-agent -k / Agent pid 1177 killed; / Finished: SUCCESS"

The test asserts the build log contains "Failed to run ssh-agent -k", which only happens if the teardown's second "ssh-agent -k" fails. Because ssh-agent daemonizes and is reparented to PID 1, a non-reaping PID 1 leaves the killed agent as a zombie, kill() still succeeds, and the message is never logged. The build itself succeeds; the assertion depends on the reaping behavior of the environment.

The same run against 402.vc9cec9230d4b_ passes: Tests run: 30,
Failures: 0, Errors: 0, Skipped: 1.

Extend the Renovate skip range from 403.x-416.x to 403.x-417.x. 418.x and later are still allowed so a fix is picked up automatically.

See jenkinsci/ssh-agent-plugin#290

Testing done

see description of testing done

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests that demonstrate the feature works or the issue is fixed

…7230)"

Rolling back to 402.vc9cec9230d4b_ for the same reason as #7205 and #7210:
SSHAgentStepWorkflowTest.teardownDoesNotFailBuildWhenAgentAlreadyStopped
still fails under PCT.

417 could not have fixed it. The 416..417 diff is a single commit, "fix:
default ssh-agent timeout when loading legacy job configuration"
(jenkinsci/ssh-agent-plugin#300), touching only SSHAgentBuildWrapper.java,
ExecRemoteAgent.java, and a new SSHAgentBuildWrapperTimeoutTest.java.
SSHAgentStepWorkflowTest.java is byte-identical between the two tags
(blob 8b2e0c73836b50ec79b58e6c5b12aed18fe608bb).

Reproduced locally against a megawar built from this repo at
417.v1d50b_f28f0e0, run in a container whose PID 1 does not reap:

  [ERROR] Tests run: 45, Failures: 1, Errors: 0, Skipped: 1
  [ERROR]   SSHAgentStepWorkflowTest.teardownDoesNotFailBuildWhenAgentAlreadyStopped:112
  Expected: a string containing "Failed to run ssh-agent -k"
       but: was "... $ ssh-agent -k / Agent pid 1177 killed; / Finished: SUCCESS"

The test asserts the build log contains "Failed to run ssh-agent -k",
which only happens if the teardown's second "ssh-agent -k" fails. Because
ssh-agent daemonizes and is reparented to PID 1, a non-reaping PID 1
leaves the killed agent as a zombie, kill() still succeeds, and the
message is never logged. The build itself succeeds; the assertion depends
on the reaping behavior of the environment.

The same run against 402.vc9cec9230d4b_ passes: Tests run: 30,
Failures: 0, Errors: 0, Skipped: 1.

Extend the Renovate skip range from 403.x-416.x to 403.x-417.x. 418.x and
later are still allowed so a fix is picked up automatically.

See jenkinsci/ssh-agent-plugin#290

Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
@darinpope
darinpope requested a review from a team as a code owner August 9, 2026 13:39
@darinpope darinpope added the dependencies Pull requests that update a dependency file label Aug 9, 2026

@MarkEWaite MarkEWaite left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@MarkEWaite
MarkEWaite enabled auto-merge (squash) August 9, 2026 13:40
@MarkEWaite
MarkEWaite merged commit eb9b41e into master Aug 9, 2026
5 checks passed
@MarkEWaite
MarkEWaite deleted the revert-7230-ssh-agent-417 branch August 9, 2026 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants