Merge pull request #752 from zbynek/help-update

Update terminology
jenkinsci · Jul 19, 2023 · 904c2ea · 904c2ea
2 parents a180afe + c88266c
commit 904c2ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.../src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html b/.../src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html
@@ -1,7 +1,7 @@
 <div>
     Specify where to obtain a source code repository containing your Groovy script.
-    It will be checked out somewhere on the Jenkins master and used to load your Pipeline script.
+    It will be checked out somewhere on the Jenkins controller and used to load your Pipeline script.
     (If you wish to use other files from the same repository during your Pipeline,
-    you will need to check them out separately on some slave;
+    you will need to check them out separately on some agent;
     this checkout cannot be reused.)
 </div>
diff --git a/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html b/plugin/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html
@@ -5,7 +5,7 @@
     </p>
     <pre>
     def pipeline
-    node('slave') {
+    node('agent') {
         pipeline = load 'pipeline.groovy'
         pipeline.functionA()
     }

diff --git a/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java b/plugin/src/test/java/org/jenkinsci/plugins/workflow/WorkflowTest.java
@@ -290,10 +290,10 @@ public void onNewHead(FlowNode node) {
     @Test public void env() {
         story.addStep(new Statement() {
             @Override public void evaluate() throws Throwable {
-                Map<String,String> slaveEnv = new HashMap<>();
-                slaveEnv.put("BUILD_TAG", null);
-                slaveEnv.put("PERMACHINE", "set");
-                createSpecialEnvSlave(story.j, "agent", null, slaveEnv);
+                Map<String,String> agentEnv = new HashMap<>();
+                agentEnv.put("BUILD_TAG", null);
+                agentEnv.put("PERMACHINE", "set");
+                createSpecialEnvSlave(story.j, "agent", null, agentEnv);
                 p = jenkins().createProject(WorkflowJob.class, "demo");
                 p.setDefinition(new CpsFlowDefinition("node('agent') {\n"
                         + "  if (isUnix()) {sh 'echo tag=$BUILD_TAG PERMACHINE=$PERMACHINE'} else {bat 'echo tag=%BUILD_TAG% PERMACHINE=%PERMACHINE%'}\n"