Skip to content

Use f:dropdownDescriptorSelector for agent launcher #11055

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.

Sign up for GitHub

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

Merged
timja merged 1 commit into from
Sep 17, 2025
Merged

Use f:dropdownDescriptorSelector for agent launcher #11055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions core/src/main/resources/hudson/model/Slave/help-launcher.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,6 @@ THE SOFTWARE.
<l:ajax>
<div>
${%Controls how Jenkins starts this agent.}

<dl>
<j:forEach var="d" items="${h.getComputerLauncherDescriptors()}">
<dt><b>${d.displayName}</b></dt>
<dd>
<st:include class="${d.clazz}" page="help.jelly" optional="true"/>
</dd>
</j:forEach>
</dl>
</div>
</l:ajax>
</j:jelly>
17 changes: 2 additions & 15 deletions core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,8 @@ THE SOFTWARE.
<f:slave-mode name="mode" node="${it}" />

<!-- TODO: should be packaged as a tag -->
<j:set var="itDescriptor" value="${descriptor}"/>
<f:dropdownList name="slave.launcher" title="${%Launch method}"
help="${descriptor.getHelpFile('launcher')}">
<j:forEach var="d" items="${descriptor.computerLauncherDescriptors(it)}">
<f:dropdownListBlock value="${d.clazz.name}" name="${d.displayName}"
selected="${it.launcher.descriptor==d}"
title="${d.displayName}">
<j:set var="descriptor" value="${d}"/>
<j:set var="instance"
value="${it.launcher.descriptor==d ? it.launcher : null}"/>
<f:class-entry descriptor="${d}" />
<st:include from="${d}" page="${d.configPage}" optional="true"/>
</f:dropdownListBlock>
</j:forEach>
</f:dropdownList>
<j:set var="computerLauncherDescriptors" value="${descriptor.computerLauncherDescriptors(it)}"/>
<f:dropdownDescriptorSelector title="${%Launch method}" field="launcher" descriptors="${computerLauncherDescriptors}"/>

<!-- pointless to show this if there's only one option, which is the default -->
<j:set var="retentionStrategies" value="${descriptor.retentionStrategyDescriptors(it)}"/>
Expand Down
Loading