-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update terminology from 'slave' to 'agent' (#119)
Update public UI terminology from 'slave' to 'agent' #words-matter https://www.ibm.com/blogs/think/2020/08/words-matter-driving-thoughtful-change-toward-inclusive-language-in-technology/
- Loading branch information
1 parent
5565d6c
commit 6b7dd37
Showing
18 changed files
with
38 additions
and
38 deletions.
There are no files selected for viewing
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vSphereCloud/help-instanceCap.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<div> | ||
Maximum number of template slave instance virtual machines that this vSphere Cloud should use at one time.<br/> | ||
Maximum number of template agent instance virtual machines that this vSphere Cloud should use at one time.<br/> | ||
A value of 0 indicates no maximum value.<br/> | ||
This limit applies only to machines started as a result of vSphere Template slaves (defined below). | ||
</div> |
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/help-idleOption.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/help-launchDelay.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<div> | ||
Time (in seconds) to wait, after starting the VM, and (if selected) after the VMware tools have started. | ||
<ul> | ||
<li>If the slave is responsible for connecting to the master (e.g. JNLP) then this is | ||
the maximum amount of time that the master will wait for the slave to come online before timing out.</li> | ||
<li>If the master is responsible for connecting to the slave (e.g. SSH) then this is | ||
<li>If the agent is responsible for connecting to the master (e.g. JNLP) then this is | ||
the maximum amount of time that the master will wait for the agent to come online before timing out.</li> | ||
<li>If the master is responsible for connecting to the agent (e.g. SSH) then this is | ||
the exact amount of time that the master will delay before commencing the connection process.</li> | ||
</ul> | ||
</div> |
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/help-vmName.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<div>Name of the virtual machine as it appears in vSphere. | ||
<p>If more than one slave uses the same virtual machine name, only one at | ||
time will be started; this would be the case where a slave machine is | ||
<p>If more than one agent uses the same virtual machine name, only one at | ||
time will be started; this would be the case where an agent machine is | ||
associated with a virtual machine AND a snapshot. This allows Jenkins | ||
to use the same virtual machine but with different slave options or | ||
to use the same virtual machine but with different agent options or | ||
a snapshot. | ||
</div> |
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/help-vsDescription.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<div>Name of the vSphere Cloud that this slave machine exists on.</div> | ||
<div>Name of the vSphere Cloud that this agent machine exists on.</div> |
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlave/help-waitForVMTools.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<div>If enabled, and the virtual machine is started by Jenkins, Jenkins will wait for VMware Tools to become active before allowing the slave to take any jobs. Only useful if VMware Tools is installed on the virtual machine.</div> | ||
<div>If enabled, and the virtual machine is started by Jenkins, Jenkins will wait for VMware Tools to become active before allowing the agent to take any jobs. Only useful if VMware Tools is installed on the virtual machine.</div> |
8 changes: 4 additions & 4 deletions
8
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-forceVMLaunch.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
<div> | ||
If you are using a Launch method where the slave connects to the | ||
If you are using a Launch method where the agent connects to the | ||
master, e.g. Java Web Start, then tick this box. | ||
<p> | ||
Each launch method tells Jenkins whether or not the Jenkins master can | ||
initiate the process itself or not. In the case of "passive" methods | ||
where the Jenkins master takes no action itself, Jenkins will be | ||
(mis)informed that it is unable to take action to start the slave. <br /> | ||
(mis)informed that it is unable to take action to start the agent. <br /> | ||
This flag overrides that information. <br /> This is appropriate for | ||
cloud-provisioned slaves because the act of creating the slave (which | ||
the Jenkins master can do) should trigger the slave's connection. | ||
cloud-provisioned agents because the act of creating the agent (which | ||
the Jenkins master can do) should trigger the agent's connection. | ||
</p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-launchDelay.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<div> | ||
Time, in seconds, to wait after starting the VM, and after the VMware tools have started. | ||
<dl> | ||
<dt>If the slave is responsible for connecting to the master (e.g. JNLP) then this is:</dt> | ||
<dd>the maximum amount of time that the master will wait for the slave to come online before timing out.</dd> | ||
<dt>If the master is responsible for connecting to the slave (e.g. SSH) then this is:</dt> | ||
<dt>If the agent is responsible for connecting to the master (e.g. JNLP) then this is:</dt> | ||
<dd>the maximum amount of time that the master will wait for the agent to come online before timing out.</dd> | ||
<dt>If the master is responsible for connecting to the agent (e.g. SSH) then this is:</dt> | ||
<dd>the exact amount of time that the master will delay before starting that process.</dd> | ||
</dl> | ||
</div> |
8 changes: 4 additions & 4 deletions
8
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-launcher.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,14 @@ | ||
<div> | ||
Specifies the method by which the Jenkins slave agent will be launched on the slave. | ||
Specifies the method by which the Jenkins agent will be launched. | ||
<dl> | ||
<dt>Java Web Start</dt> | ||
<dd>Relies on processes within the virtual machine to connect to Jenkins. | ||
If you use this, you may find it useful to use GuestInfo Properties to pass data to the virtual machine telling it where to connect to.</dd> | ||
<dt>Execution of command</dt> | ||
<dd>The Jenkins master machine runs a command the connect to this slave.</dd> | ||
<dd>The Jenkins master machine runs a command the connect to this agent.</dd> | ||
<dt>SSH (default)</dt> | ||
<dd>The Jenkins master logs into the slave via SSH, using the credentials specified, and uses that session to push the slave code onto the slave and then run it. | ||
You should leave the "host" field blank as the plugin will automatically fill that in itself (once it knows the IP address of the slave). | ||
<dd>The Jenkins master logs into the agent via SSH, using the credentials specified, and uses that session to push the agent code onto the agent and then run it. | ||
You should leave the "host" field blank as the plugin will automatically fill that in itself (once it knows the IP address of the agent). | ||
</dd> | ||
</dl> | ||
</div> |
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-limitedRunCount.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...ain/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-retentionStrategy.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<div> | ||
Says whether to use the slave once and then immediately dispose of it, or to keep the slave until it is no longer required. | ||
Says whether to use the agent once and then immediately dispose of it, or to keep the agent until it is no longer required. | ||
<ul> | ||
<li>If you use the run-once strategy, you should ensure that there is only 1 executor.</li> | ||
<li>If you use the keep-until-idle strategy, you should ensure that "disconnect after limited builds" is disabled (set to 0).</li> | ||
</ul> | ||
Both these options have an idle timeout (in minutes) after which to kill the slave, but for a run-once strategy, this is only a fail-safe if the slave fails to connect. | ||
Normally a run-once slave will be terminated immediately after it has completed its one-and-only job. | ||
Both these options have an idle timeout (in minutes) after which to kill the slave, but for a run-once strategy, this is only a fail-safe if the agent fails to connect. | ||
Normally a run-once agent will be terminated immediately after it has completed its one-and-only job. | ||
</div> |
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-waitForVMTools.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/help-idleOption.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/help-launchDelay.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<div> | ||
Time, in seconds, to wait after starting the VM, and after the VMware tools have started. | ||
<dl> | ||
<dt>If the slave is responsible for connecting to the master (e.g. JNLP) then this is:</dt> | ||
<dd>the maximum amount of time that the master will wait for the slave to come online before timing out.</dd> | ||
<dt>If the master is responsible for connecting to the slave (e.g. SSH) then this is:</dt> | ||
<dt>If the agent is responsible for connecting to the master (e.g. JNLP) then this is:</dt> | ||
<dd>the maximum amount of time that the master will wait for the agent to come online before timing out.</dd> | ||
<dt>If the master is responsible for connecting to the agent (e.g. SSH) then this is:</dt> | ||
<dd>the exact amount of time that the master will delay before starting that process.</dd> | ||
</dl> | ||
</div> |
6 changes: 3 additions & 3 deletions
6
src/main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/help-vmName.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<div>Name of the virtual machine as it appears in vSphere. | ||
<p>If more than one slave uses the same virtual machine name, only one at | ||
time will be started; this would be the case where a slave machine is | ||
<p>If more than one agent uses the same virtual machine name, only one at | ||
time will be started; this would be the case where an agent machine is | ||
associated with a virtual machine AND a snapshot. This allows Jenkins | ||
to use the same virtual machine but with different slave options or | ||
to use the same virtual machine but with different agent options or | ||
a snapshot. | ||
</div> |
2 changes: 1 addition & 1 deletion
2
...main/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/help-vsDescription.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<div>Name of the vSphere Cloud that this slave machine exists on.</div> | ||
<div>Name of the vSphere Cloud that this agent machine exists on.</div> |
2 changes: 1 addition & 1 deletion
2
...ain/resources/org/jenkinsci/plugins/vsphereCloudProvisionedSlave/help-waitForVMTools.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<div>If enabled, and the virtual machine is started by Jenkins, Jenkins will wait for VMware Tools to become active before allowing the slave to take any jobs. Only useful if VMware Tools is installed on the virtual machine.</div> | ||
<div>If enabled, and the virtual machine is started by Jenkins, Jenkins will wait for VMware Tools to become active before allowing the agent to take any jobs. Only useful if VMware Tools is installed on the virtual machine.</div> |