Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use configured registry for jenkins-agent when running in agent-injection mode #1613

Merged
merged 1 commit into from
Oct 17, 2024

Conversation

iandrewt
Copy link
Contributor

I was previously using an ECR Pull Through Cache for the inbound-agent image, but this wasn't respected when using agentInjection: true. This PR fixes that

Testing done

Added a unit test, and tested on my own Jenkins instance - expected behaviour present

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 demonstrates feature works or fixes the issue

…tion mode

Signed-off-by: Andrew Titmuss <iandrewt@icloud.com>
@iandrewt iandrewt requested a review from a team as a code owner October 16, 2024 04:18
@iandrewt
Copy link
Contributor Author

The agent injection feature is great btw - it lets me keep a maintained runner image without coupling it with a specific version of Jenkins (or even Jenkins itself). But given the jar file itself is only 1.4MB (compared to the compressed 130MB+ of the inbound-agent image), perhaps it would make sense to use a BusyBox image to copy the file from the controller instance instead at https://jenkins-host/jnlpJars/agent.jar. There'd still be the startup script to account for though

@Vlatombe Vlatombe added the bug Bug Fixes label Oct 17, 2024
Copy link
Member

@Vlatombe Vlatombe left a comment

Choose a reason for hiding this comment

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

Good catch ! Thanks

@Vlatombe Vlatombe merged commit 7fa01b3 into jenkinsci:master Oct 17, 2024
8 checks passed
@iandrewt iandrewt deleted the jenkins-agent-registry branch October 17, 2024 07:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug Fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants