From 0c6d3eb3965dfae682168ca5edcdf6f8e0c742fa Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 10 Sep 2025 20:45:59 -0400
Subject: [PATCH] Use `f:dropdownDescriptorSelector` for agent launcher

---
 .../hudson/model/Slave/help-launcher.jelly      |  9 ---------
 .../slaves/DumbSlave/configure-entries.jelly    | 17 ++---------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/core/src/main/resources/hudson/model/Slave/help-launcher.jelly b/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
index c9156b09fdc9..5bc7398afde3 100644
--- a/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
+++ b/core/src/main/resources/hudson/model/Slave/help-launcher.jelly
@@ -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>
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
index bb6ca2e99838..e70e455be703 100644
--- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
+++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly
@@ -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)}"/>