- By default, builds of this project may be executed on any build agents that
+ By default, builds of this project may be executed on any agents that
are available and configured to accept new builds.
When this option is checked, you have the possibility to ensure that builds of
diff --git a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
index af9f3c2747..d5538a43a9 100644
--- a/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
+++ b/core/src/main/resources/hudson/slaves/JNLPLauncher/main_pt_BR.properties
@@ -21,7 +21,7 @@
# THE SOFTWARE.
launch\ agent=Lan\u00e7ar agente
-# TCP port for JNLP slave agents is disabled.
+# The TCP port for the JNLP agents is disabled.
slaveAgentPort.disabled=Porta TCP para JNLP est\u00e1 desativada
Connected\ via\ JNLP\ agent.=Conectado via JNLP agente.
# Go to security configuration screen and change it
diff --git a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_bg.properties b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_bg.properties
index bf6faaac09..c3b52a1303 100644
--- a/core/src/main/resources/jenkins/model/Jenkins/systemInfo_bg.properties
+++ b/core/src/main/resources/jenkins/model/Jenkins/systemInfo_bg.properties
@@ -26,7 +26,7 @@ Name=\
\u0418\u043c\u0435
No\ plugins\ installed.=\
\u041d\u0435 \u0441\u0430 \u0438\u043d\u0441\u0442\u0430\u043b\u0438\u0440\u0430\u043d\u0438 \u043f\u0440\u0438\u0441\u0442\u0430\u0432\u043a\u0438
-# Visit this page for master and slave thread dumps.
+# Visit this page for master and agent thread dumps.
threadDump_blurb=\
\u041d\u0430 \u0442\u0430\u0437\u0438 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 f\u0441\u0430 \u0434\u0430\u0434\u0435\u043d\u0438 \u0440\u0430\u0437\u0442\u043e\u0432\u0430\u0440\u0432\u0430\u043d\u0438\u044f\u0442\u0430 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u0438\u0442\u0435 \u0438\
\u043f\u043e\u0434\u0447\u0438\u043d\u0435\u043d\u0438 \u043d\u0438\u0448\u043a\u0438.
diff --git a/core/src/main/resources/jenkins/security/s2m/filepath-filter.conf b/core/src/main/resources/jenkins/security/s2m/filepath-filter.conf
index 0905bd0ce8..ca58e15ecf 100644
--- a/core/src/main/resources/jenkins/security/s2m/filepath-filter.conf
+++ b/core/src/main/resources/jenkins/security/s2m/filepath-filter.conf
@@ -1,7 +1,7 @@
# GENERATED FILE. DO NOT MODIFY.
#
# This file is for Jenkins core developers to list what we think are the best filtering rules
-# for apparently harmless accesses to files on the Jenkins master from slaves.
+# for apparently harmless accesses to files on the Jenkins master from agents.
#
# To override these rules, place *.conf files by other names into this folder. Files are sorted
# before parsed, so using a lower number allows you to override what we have here. This file
@@ -10,12 +10,12 @@
# See https://jenkins.io/redirect/security-144 for more details.
# This directory contains credentials, master encryption keys, and other sensitive information
-# that slaves have absolutely no business with.
+# that agents have absolutely no business with.
# Unless there are rules in other files allowing access to other portions of $JENKINS_HOME,
# this rule as it stands here has no effect, because anything left unspecified is rejected.
deny all /secrets($|/.*)
-# User content is publicly readable, so quite safe for slaves to read, too.
+# User content is publicly readable, so quite safe for agents to read, too.
# (The xunit plugin is known to read from here.)
# https://jenkins.io/redirect/user-content-directory
allow read,stat /userContent($|/.*)
@@ -28,7 +28,7 @@ deny all /program.dat
deny all /workflow($|/.*)
# Various plugins read/write files under build directories, so allow them all.
-# - git 1.x writes changelog.xml from the slave (2.x writes from the master so need not be listed)
+# - git 1.x writes changelog.xml from the agent (2.x writes from the master so need not be listed)
# - analysis-core and plugins based on it write reports to workspace-files/
# - cobertura writes coverage.xml
# - violations writes violations.xml and other content under violations/
diff --git a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
index 3422f15553..f4a0f9073c 100644
--- a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
+++ b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
@@ -1,2 +1,2 @@
-summary=Accepts connections from remote clients so that they can be used as additional build agents. \
+summary=Accepts connections from remote clients so that they can be used as additional agents. \
This protocol is unencrypted.
diff --git a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_bg.properties b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_bg.properties
index c19dc4a111..4e35de871c 100644
--- a/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_bg.properties
+++ b/core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_bg.properties
@@ -23,7 +23,7 @@
Accepts\ connections\ from\ remote\ clients\ so\ that\ they\ can\ be\ used\ as\ additional\ build\ agents=\
\u041f\u0440\u0438\u0435\u043c\u0430\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0438 \u043e\u0442 \u043e\u0442\u0434\u0430\u043b\u0435\u0447\u0435\u043d\u0438 \u043a\u043b\u0438\u0435\u043d\u0442\u0438, \u0442\u0430\u043a\u0430 \u0447\u0435 \u0442\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442 \u043a\u0430\u0442\u043e\
\u0434\u043e\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u043d\u0438 \u043c\u0430\u0448\u0438\u043d\u0438 \u0437\u0430 \u0438\u0437\u0433\u0440\u0430\u0436\u0434\u0430\u043d\u0435.
-# Accepts connections from remote clients so that they can be used as additional build agents. \
+# Accepts connections from remote clients so that they can be used as additional agents. \
# This protocol is unencrypted.
summary=\
\u041f\u0440\u0438\u0435\u043c\u0430\u043d\u0435 \u043d\u0430 \u0432\u0440\u044a\u0437\u043a\u0438 \u043e\u0442 \u043e\u0442\u0434\u0430\u043b\u0435\u0447\u0435\u043d\u0438 \u043a\u043b\u0438\u0435\u043d\u0442\u0438, \u0442\u0430\u043a\u0430 \u0447\u0435 \u0442\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0442 \u043a\u0430\u0442\u043e\
diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java
index 0d38795d27..28b5292ac1 100644
--- a/core/src/test/java/hudson/LauncherTest.java
+++ b/core/src/test/java/hudson/LauncherTest.java
@@ -73,7 +73,7 @@ public class LauncherTest {
// returns immediately and pgrep sleep => nothing. But without fix
// hudson.model.Hudson.instance.nodes[0].rootPath.createLauncher(new hudson.util.StreamTaskListener(System.err)).
// launch().cmds("sleep", "1d").stdout(System.out).stderr(System.err).start().kill()
- // hangs and on slave machine pgrep sleep => one process; after manual kill, script returns.
+ // hangs and on agent machine pgrep sleep => one process; after manual kill, script returns.
}
private static class NoopCallable extends MasterToSlaveCallable {
diff --git a/core/src/test/java/hudson/model/JobTest.java b/core/src/test/java/hudson/model/JobTest.java
index 22679f2826..3cef5b4c7b 100644
--- a/core/src/test/java/hudson/model/JobTest.java
+++ b/core/src/test/java/hudson/model/JobTest.java
@@ -49,7 +49,7 @@ public class JobTest {
@Issue("JENKINS-14807")
@Test
public void use_slave_platform_path_separator_when_contribute_path() throws Throwable {
- // mock environment to simulate EnvVars of slave node with different platform than master
+ // mock environment to simulate EnvVars of agent node with different platform than master
Platform slavePlatform = Platform.current() == Platform.UNIX ? Platform.WINDOWS : Platform.UNIX;
PowerMockito.mockStatic(Platform.class);
Mockito.when(Platform.current()).thenReturn(slavePlatform);
@@ -80,7 +80,7 @@ public class JobTest {
String path = "/test";
env.override("PATH+TEST", path);
- assertThat("The contributed PATH was not joined using the path separator defined in slave node", //
+ assertThat("The contributed PATH was not joined using the path separator defined in agent node", //
env.get("PATH"), //
CoreMatchers.containsString(path + (slavePlatform == Platform.WINDOWS ? ';' : ':')));
}
diff --git a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
index e0cc02ef9f..39503d7e62 100644
--- a/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
+++ b/test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java
@@ -77,7 +77,7 @@ public class JnlpAccessWithSecuredHudsonTest {
public TemporaryFolder tmp = new TemporaryFolder();
/**
- * Creates a new slave that needs to be launched via JNLP.
+ * Creates a new agent that needs to be launched via JNLP.
*/
protected Slave createNewJnlpSlave(String name) throws Exception {
return new DumbSlave(name,"",System.getProperty("java.io.tmpdir")+'/'+name,"2", Mode.NORMAL, "", new JNLPLauncher(true), RetentionStrategy.INSTANCE, Collections.EMPTY_LIST);
diff --git a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
index ec5b4843f6..efbee5715f 100644
--- a/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
+++ b/test/src/test/java/hudson/cli/UpdateNodeCommandTest.java
@@ -78,7 +78,7 @@ public class UpdateNodeCommandTest {
assertThat(result, succeededSilently());
- assertThat("A slave with old name should not exist", j.jenkins.getNode("MySlave"), nullValue());
+ assertThat("An agent with old name should not exist", j.jenkins.getNode("MySlave"), nullValue());
final Node updatedSlave = j.jenkins.getNode("SlaveFromXML");
assertThat(updatedSlave.getNodeName(), equalTo("SlaveFromXML"));
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
index f966f4e56b..5a35b101f3 100644
--- a/test/src/test/java/hudson/model/ProjectTest.java
+++ b/test/src/test/java/hudson/model/ProjectTest.java
@@ -728,7 +728,7 @@ public class ProjectTest {
}
/**
- * Job is restricted, but label can not be provided by any cloud, only normal slaves. Then job will not submit, because no slave is available.
+ * Job is restricted, but label can not be provided by any cloud, only normal agents. Then job will not submit, because no slave is available.
* @throws Exception
*/
@Test
@@ -748,12 +748,12 @@ public class ProjectTest {
j.buildAndAssertSuccess(proj);
//Now create another slave. And restrict the job to that slave. The slave is offline, leaving the job with no assignable nodes.
- //We tell our mock SCM to return that it has got changes. But since there are no slaves, we get the desired result.
+ //We tell our mock SCM to return that it has got changes. But since there are no agents, we get the desired result.
Slave s2 = j.createSlave();
proj.setAssignedLabel(s2.getSelfLabel());
requiresWorkspaceScm.hasChange = true;
- //Poll (We now should have NO online slaves, this should now return NO_CHANGES.
+ //Poll (We now should have NO online agents, this should now return NO_CHANGES.
PollingResult pr = proj.poll(j.createTaskListener());
assertFalse(pr.hasChanges());
diff --git a/test/src/test/java/hudson/model/QueueTest.java b/test/src/test/java/hudson/model/QueueTest.java
index 53487ecfa5..ed550b06be 100644
--- a/test/src/test/java/hudson/model/QueueTest.java
+++ b/test/src/test/java/hudson/model/QueueTest.java
@@ -652,7 +652,7 @@ public class QueueTest {
* and then introduce a security restriction to prohibit that.
*/
@Test public void permissionSensitiveSlaveAllocations() throws Exception {
- r.jenkins.setNumExecutors(0); // restrict builds to those slaves
+ r.jenkins.setNumExecutors(0); // restrict builds to those agents
DumbSlave s1 = r.createSlave();
DumbSlave s2 = r.createSlave();
diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java
index 3d73a15d6d..98c9d91963 100644
--- a/test/src/test/java/hudson/model/ViewTest.java
+++ b/test/src/test/java/hudson/model/ViewTest.java
@@ -363,11 +363,11 @@ public class ViewTest {
view2.add(foreignJob);
foreignJob.setAssignedLabel(j.jenkins.getLabel("label0||label1"));
- // contains all slaves having labels associated with freestyleJob or matrixJob
+ // contains all agents having labels associated with freestyleJob or matrixJob
assertContainsNodes(view1, slave0, slave1, slave2, slave3);
assertNotContainsNodes(view1, slave4);
- // contains all slaves having labels associated with foreignJob
+ // contains all agents having labels associated with foreignJob
assertContainsNodes(view2, slave0, slave1, slave3);
assertNotContainsNodes(view2, slave2, slave4);
diff --git a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
index 7cb41a5943..4a84caaf5e 100644
--- a/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
+++ b/test/src/test/java/hudson/model/labels/LabelExpressionTest.java
@@ -75,7 +75,7 @@ public class LabelExpressionTest {
FreeStyleProject p1 = j.createFreeStyleProject();
p1.getBuildersList().add(new TestBuilder() {
public boolean perform(AbstractBuild build, Launcher launcher, BuildListener listener) throws InterruptedException, IOException {
- seq.phase(0); // first, make sure the w32 slave is occupied
+ seq.phase(0); // first, make sure the w32 agent is occupied
seq.phase(2);
seq.done();
return true;
@@ -91,7 +91,7 @@ public class LabelExpressionTest {
Future f1 = p1.scheduleBuild2(0);
- seq.phase(1); // we schedule p2 build after w32 slave is occupied
+ seq.phase(1); // we schedule p2 build after w32 agent is occupied
Future f2 = p2.scheduleBuild2(0);
Thread.sleep(1000); // time window to ensure queue has tried to assign f2 build
diff --git a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
index e2ab922e8d..070ca28457 100644
--- a/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
+++ b/test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java
@@ -22,7 +22,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
/**
* This class tests that environment variables from node properties are applied,
- * and that the priority is maintained: parameters > slave node properties >
+ * and that the priority is maintained: parameters > agent node properties >
* master node properties
*/
public class EnvironmentVariableNodePropertyTest extends HudsonTestCase {
@@ -31,7 +31,7 @@ public class EnvironmentVariableNodePropertyTest extends HudsonTestCase {
private FreeStyleProject project;
/**
- * Slave properties are available
+ * Agent properties are available
*/
public void testSlavePropertyOnSlave() throws Exception {
setVariables(slave, new Entry("KEY", "slaveValue"));
@@ -53,7 +53,7 @@ public class EnvironmentVariableNodePropertyTest extends HudsonTestCase {
}
/**
- * Both slave and master properties are available, but slave properties have priority
+ * Both agent and master properties are available, but agent properties have priority
*/
public void testSlaveAndMasterPropertyOnSlave() throws Exception {
jenkins.getGlobalNodeProperties().replaceBy(
@@ -67,8 +67,8 @@ public class EnvironmentVariableNodePropertyTest extends HudsonTestCase {
}
/**
- * Slave and master properties and parameters are available.
- * Priority: parameters > slave > master
+ * Agent and master properties and parameters are available.
+ * Priority: parameters > agent > master
* @throws Exception
*/
public void testSlaveAndMasterPropertyAndParameterOnSlave()
diff --git a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java
index 22d16c43b5..d9488bad52 100644
--- a/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java
+++ b/test/src/test/java/hudson/tasks/EnvVarsInConfigTasksTest.java
@@ -78,7 +78,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
project.setScm(new ExtractResourceSCM(getClass().getResource(
"/simple-projects.zip")));
- // test the regular slave - variable not expanded
+ // test the regular agent - variable not expanded
project.setAssignedLabel(slaveRegular.getSelfLabel());
FreeStyleBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -89,7 +89,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
System.out.println(buildLogRegular);
assertTrue(buildLogRegular.contains(DUMMY_LOCATION_VARNAME));
- // test the slave with prepared environment
+ // test the agent with prepared environment
project.setAssignedLabel(slaveEnv.getSelfLabel());
build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -119,7 +119,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
new Ant("-Dtest.property=cor${" + DUMMY_LOCATION_VARNAME
+ "}rect", "varAnt", "", buildFile, ""));
- // test the regular slave - variable not expanded
+ // test the regular agent - variable not expanded
project.setAssignedLabel(slaveRegular.getSelfLabel());
FreeStyleBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -129,7 +129,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
String buildLogRegular = getBuildLog(build);
assertTrue(buildLogRegular.contains(Ant_ExecutableNotFound("varAnt")));
- // test the slave with prepared environment
+ // test the agent with prepared environment
project.setAssignedLabel(slaveEnv.getSelfLabel());
build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -158,7 +158,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
+ DUMMY_LOCATION_VARNAME + "}", "", "",
false));
- // test the regular slave - variable not expanded
+ // test the regular agent - variable not expanded
project.setAssignedLabel(slaveRegular.getSelfLabel());
FreeStyleBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -169,7 +169,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
System.out.println(buildLogRegular);
assertTrue(buildLogRegular.contains(DUMMY_LOCATION_VARNAME));
- // test the slave with prepared environment
+ // test the agent with prepared environment
project.setAssignedLabel(slaveEnv.getSelfLabel());
build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -191,7 +191,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
project.setMaven("varMaven");
project.setGoals("clean${" + DUMMY_LOCATION_VARNAME + "}");
- // test the regular slave - variable not expanded
+ // test the regular agent - variable not expanded
project.setAssignedLabel(slaveRegular.getSelfLabel());
MavenModuleSetBuild build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
@@ -201,7 +201,7 @@ public class EnvVarsInConfigTasksTest extends HudsonTestCase {
String buildLogRegular = getBuildLog(build);
System.out.println(buildLogRegular);
- // test the slave with prepared environment
+ // test the agent with prepared environment
project.setAssignedLabel(slaveEnv.getSelfLabel());
build = project.scheduleBuild2(0).get();
System.out.println(build.getDisplayName() + " completed");
diff --git a/test/src/test/java/hudson/util/ProcessTreeKillerTest.java b/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
index 5382c6f134..43d376e095 100644
--- a/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
+++ b/test/src/test/java/hudson/util/ProcessTreeKillerTest.java
@@ -158,7 +158,7 @@ public class ProcessTreeKillerTest {
pb.command("sleep", "5m");
}
- // Create a slave so we can tell it to kill the process
+ // Create an agent so we can tell it to kill the process
Slave s = j.createSlave();
s.toComputer().connect(false).get();
diff --git a/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java b/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java
index 41bb8100a2..d0711adf59 100644
--- a/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java
+++ b/test/src/test/java/jenkins/model/UnlabeledLoadStatisticsTest.java
@@ -61,7 +61,7 @@ public class UnlabeledLoadStatisticsTest {
assertEquals("Queue must be empty when the test starts", 0, queue.getBuildableItems().size());
assertEquals("Statistics must return 0 when the test starts", 0, unlabeledLoad.computeQueueLength());
- // Disable builds by default, create a slave to prevent assigning of "master" labels
+ // Disable builds by default, create an agent to prevent assigning of "master" labels
j.jenkins.setNumExecutors(0);
DumbSlave slave = j.createOnlineSlave(new LabelAtom("testLabel"));
slave.setMode(Node.Mode.EXCLUSIVE);
diff --git a/test/src/test/java/jenkins/security/Security218Test.java b/test/src/test/java/jenkins/security/Security218Test.java
index b3cfc83d43..3d26bfaf55 100644
--- a/test/src/test/java/jenkins/security/Security218Test.java
+++ b/test/src/test/java/jenkins/security/Security218Test.java
@@ -67,7 +67,7 @@ public class Security218Test implements Serializable {
}
/**
- * The attack scenario here is that a master sends a normal command to a slave and a slave
+ * The attack scenario here is that a master sends a normal command to an agent and
* inserts a malicious response.
*/
@SuppressWarnings("ConstantConditions")
@@ -88,7 +88,7 @@ public class Security218Test implements Serializable {
// TODO: reconcile this duplicate with JnlpAccessWithSecuredHudsonTest
/**
- * Creates a new slave that needs to be launched via JNLP.
+ * Creates a new agent that needs to be launched via JNLP.
*
* @see #launchJnlpSlave(Slave)
*/
@@ -100,7 +100,7 @@ public class Security218Test implements Serializable {
// TODO: reconcile this duplicate with JnlpAccessWithSecuredHudsonTest
/**
- * Launch a JNLP slave created by {@link #createJnlpSlave(String)}
+ * Launch a JNLP agent created by {@link #createJnlpSlave(String)}
*/
public Channel launchJnlpSlave(Slave slave) throws Exception {
j.createWebClient().goTo("computer/"+slave.getNodeName()+"/slave-agent.jnlp?encrypt=true", "application/octet-stream");
@@ -124,7 +124,7 @@ public class Security218Test implements Serializable {
Thread.sleep(100);
}
- throw new AssertionError("JNLP slave agent failed to connect");
+ throw new AssertionError("The JNLP agent failed to connect");
}
@After
diff --git a/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java b/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java
index 37af2825c0..73777e731b 100644
--- a/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java
+++ b/test/src/test/java/jenkins/security/s2m/AdminFilePathFilterTest.java
@@ -175,7 +175,7 @@ public class AdminFilePathFilterTest {
}
private void checkSlave_can_readFile(Slave s, FilePath target) throws Exception {
- // slave can read file from userContent
+ // The agent can read file from userContent
String content = s.getChannel().call(new ReadFileS2MCallable(target));
// and the master can directly reach it
assertEquals(target.readToString(), content);
diff --git a/test/src/test/resources/hudson/model/node.xml b/test/src/test/resources/hudson/model/node.xml
index 0a7827642f..acf86684a4 100644
--- a/test/src/test/resources/hudson/model/node.xml
+++ b/test/src/test/resources/hudson/model/node.xml
@@ -1,7 +1,7 @@
SlaveFromXML
- XML slave description
+ XML agent description
/user/hudson/workspace
42
NORMAL
diff --git a/war/src/main/webapp/help/system-config/master-slave/availability_ja.html b/war/src/main/webapp/help/system-config/master-slave/availability_ja.html
index fc897d3090..9d42f48bb4 100644
--- a/war/src/main/webapp/help/system-config/master-slave/availability_ja.html
+++ b/war/src/main/webapp/help/system-config/master-slave/availability_ja.html
@@ -12,15 +12,15 @@
diff --git a/war/src/main/webapp/help/system-config/master-slave/clock.html b/war/src/main/webapp/help/system-config/master-slave/clock.html
index 2c064e58aa..04176edd84 100644
--- a/war/src/main/webapp/help/system-config/master-slave/clock.html
+++ b/war/src/main/webapp/help/system-config/master-slave/clock.html
@@ -1,5 +1,5 @@
Many aspects of a build are sensitive to the clock, and therefore if the clock of the machine
- that Jenkins runs and that of the slave differ significantly, it can cause mysterious problems.
+ that Jenkins runs and that of the agent differ significantly, it can cause mysterious problems.
Consider synchronizing clocks between machines by NTP.
diff --git a/war/src/main/webapp/help/system-config/master-slave/jnlp-tunnel.html b/war/src/main/webapp/help/system-config/master-slave/jnlp-tunnel.html
index 3c2b46412f..d09dd2c200 100644
--- a/war/src/main/webapp/help/system-config/master-slave/jnlp-tunnel.html
+++ b/war/src/main/webapp/help/system-config/master-slave/jnlp-tunnel.html
@@ -1,5 +1,5 @@
- When a slave is launched through JNLP, the slave agent attempts to connect to a specific TCP port of Jenkins
+ When an agent is launched through JNLP, the agent attempts to connect to a specific TCP port of Jenkins
to establish a communication channel.
But some security sensitive network can prevent you from making this connection.
This can also happen when Jenkins runs behind a load balancer,
@@ -9,11 +9,11 @@
This tunneling option allows you to route this connection to another host/port, and useful for those situations.
The field can either take "HOST:PORT", ":PORT", or "HOST:". In the first format,
- JNLP slave agent will connect to the given TCP port on the given host, and assume that you've configured your
- network so that this port forwards the connection to Jenkins' JNLP slave TCP port.
+ JNLP agent will connect to the given TCP port on the given host, and assume that you've configured your
+ network so that this port forwards the connection to Jenkins' JNLP agent TCP port.
In the latter two formats, the default host name and port number (that is, the host name that Jenkins runs,
and the TCP port that Jenkins opened) are used to augment the missing values. In particular the HOST: format
is useful if the HTTP reverse proxy is used and Jenkins actually runs on another system.
-