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.

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

Jump to bottom

Added copy to clipboard button to agent launch snippets #7625

Merged
merged 13 commits into from Feb 20, 2023
Merged

Added copy to clipboard button to agent launch snippets #7625

Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ebfcf18
Added Copy to clipboard
prathi-mani Feb 4, 2023
e4f1ac2
Update main.jelly
prathi-mani Feb 5, 2023
68c9d7d
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 6, 2023
0e097dc
Remove trailing spaces
MarkEWaite Feb 6, 2023
bef8914
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 6, 2023
b5d82bc
Update main.jelly
prathi-mani Feb 7, 2023
3cd96ef
Update main.jelly
prathi-mani Feb 7, 2023
4abed32
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 12, 2023
ef277a9
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 17, 2023
2b634cd
One copy button per region
MarkEWaite Feb 18, 2023
0658cb3
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 18, 2023
80f8fc1
Merge branch 'master' into Add-CopyToClipboard-button
MarkEWaite Feb 18, 2023
424e2c6
Remove obsolete spaces
NotMyFault Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 12 additions & 7 deletions core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly
View file
Open in desktop
Expand Up @@ -39,22 +39,27 @@ THE SOFTWARE.
<p>
${%slaveAgent.cli.run}
</p>
<pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)}</pre>
<j:set var="copy_agent_jar" value="curl -sO ${jenkinsURL}jnlpJars/agent.jar" />
<j:set var="copy_java_cmd" value="java -jar agent.jar -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)}" />
<pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar <l:copyButton message="text copied" text="${copy_agent_jar}" tooltip="Click to copy" />
NotMyFault marked this conversation as resolved.
Show resolved Hide resolved
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp ${it.launcher.getWorkDirOptions(it)} <l:copyButton message="text copied" text="${copy_java_cmd}" tooltip="Click to copy" /> </pre>
</j:when>
<j:otherwise>
<p>
${%slaveAgent.cli.run}
</p>
<!-- TODO conceal secret w/ JS if possible -->
<pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}</pre>
<j:set var="copy_java_cmd_secret" value="java -jar agent.jar -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)}" />
<j:set var="copy_secret_to_file" value="echo ${it.jnlpMac} &gt; secret-file" />
<j:set var="copy_java_cmd_secret2" value="java -jar agent.jar -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}" />
<pre>curl -sO ${jenkinsURL}jnlpJars/agent.jar <l:copyButton message="text copied" text="${copy_agent_jar}" tooltip="Click to copy" />
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret ${it.jnlpMac} ${it.launcher.getWorkDirOptions(it)} <l:copyButton message="text copied" text="${copy_java_cmd_secret}" tooltip="Click to copy" /> </pre>
<p>
${%slaveAgent.cli.run.secret}
</p>
<pre>echo ${it.jnlpMac} > secret-file
curl -sO ${jenkinsURL}jnlpJars/agent.jar
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)}</pre>
<pre>echo ${it.jnlpMac} > secret-file <l:copyButton message="text copied" text="${copy_secret_to_file}" tooltip="Click to copy" />
curl -sO ${jenkinsURL}jnlpJars/agent.jar <l:copyButton message="text copied" text="${copy_agent_jar}" tooltip="Click to copy" />
java -jar <a href="${rootURL}/jnlpJars/agent.jar">agent.jar</a> -jnlpUrl ${jenkinsURL}${it.url}jenkins-agent.jnlp -secret @secret-file ${it.launcher.getWorkDirOptions(it)} <l:copyButton message="text copied" text="${copy_java_cmd_secret2}" tooltip="Click to copy" /> </pre>
</j:otherwise>
</j:choose>
<p>
Expand Down