From e5611eb69965223554842872d006e8a75444b6b6 Mon Sep 17 00:00:00 2001 From: Tim Van Holder Date: Sat, 13 Jun 2020 01:09:13 +0200 Subject: [PATCH 1/2] Improve Dutch help slightly. --- .../matrix/LabelAxis/help-labels_nl.html | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html b/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html index 72c56762..67bb105b 100644 --- a/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html +++ b/src/main/resources/hudson/matrix/LabelAxis/help-labels_nl.html @@ -1,15 +1,24 @@
- Geef de nodes, waar uw bouwpoging uitgevoerd wordt, op. + Geef de nodes op waar uw bouwpoging uitgevoerd zal worden. - -
+
Tijdens een bouwpoging, is de naam van de node of nodegroep, waarop de bouwpoging plaatsvindt, beschikbaar onder de "label" dimensie. Zie de beschikbare hulppaginas over dimensies indien U meer te weten wenst te komen over de dimensies van een matrixproject.
From 7535ff548128e6752db4d3fcc9b59c94815aae18 Mon Sep 17 00:00:00 2001 From: Tim Van Holder Date: Sat, 13 Jun 2020 01:55:28 +0200 Subject: [PATCH 2/2] Update references to "slaves" to use "agents" instead. This does not include translated versions, only appearances of the English word. --- README.md | 12 ++-- .../hudson/matrix/LabelAxis/help.html | 2 +- .../hudson/matrix/LabelAxis/help_zh_TW.html | 2 +- .../matrix/LabelExpAxis/help-labelExpr.html | 2 +- .../LabelExpAxis/help-labelExpr_zh_TW.html | 2 +- .../hudson/matrix/LabelExpAxis/help.html | 4 +- .../matrix/LabelExpAxis/help_zh_TW.html | 2 +- .../hudson/matrix/Messages.properties | 2 +- .../hudson/matrix/Messages_pt.properties | 2 +- .../hudson/matrix/Messages_pt_BR.properties | 2 +- .../hudson/matrix/Messages_zh_CN.properties | 72 +++++++++---------- .../hudson/matrix/Messages_zh_TW.properties | 2 +- .../help/matrix/combinationfilter_de.html | 2 +- .../help/matrix/combinationfilter_zh_TW.html | 2 +- src/test/java/hudson/matrix/AxisTest.java | 8 +-- 15 files changed, 59 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 1358e0b1..f4fbf4b0 100644 --- a/README.md +++ b/README.md @@ -54,16 +54,16 @@ be changed later. If you skip this step, you will be very confused and not get v ## Executors used by a multi-configuration project Reference: [Re: Will a multi-configuration / matrix job always use up one executor on the master?](http://groups.google.com/group/jenkinsci-users/msg/eb809fb06759d861) -A matrix build project (that uses the Slave axis) will use one additional executor ("master executor"?) -on a random node to coordinate the executions on the nodes defined by the Slave axis. -This executor is added as a temporary executor(also called as "flyweight task") to the node and does not +A matrix build project (that uses the Agent axis) will use one additional executor ("master executor"?) +on a random node to coordinate the executions on the nodes defined by the Agent axis. +This executor is added as a temporary executor (also called as "flyweight task") to the node and does not use up a configured executor slot on this node (this behavior is controlled by hudson.model.Hudson.flyweightSupport). Only this "master executor" or "flyweight task" will be affected by the "Restrict where this project can be run" option, under Advanced Project Options. "Actual" or non-flyweight build execution can be controlled with -the "Slaves" axis that can be added under the project's Configuration Matrix: individual nodes and/or labels +the "Agents" axis that can be added under the project's Configuration Matrix: individual nodes and/or labels containing multiple nodes can be selected, as well as filtering axis combinations. -You can also control which nodes can run flyweight tasks, using the [Exclude flyweight tasks plugin](https://plugins.jenkins.io/excludeMatrixParent), or you can pin the flyweight executor to a specific node (Please look under the "advanced" option of the matrix project configuration to tie the matrix parent to a label/slave). +You can also control which nodes can run flyweight tasks, using the [Exclude flyweight tasks plugin](https://plugins.jenkins.io/excludeMatrixParent), or you can pin the flyweight executor to a specific node (Please look under the "advanced" option of the matrix project configuration to tie the matrix parent to a label/agent). ## Extensions Please refer to the [list of extensions points](https://jenkins.io/doc/developer/extensions/matrix-project/) of this plugin. @@ -90,7 +90,7 @@ This plugin allows you to integrate Sauce Selenium Testing with Jenkins. A plugin to decide the execution order and valid combinations of matrix projects. ### [Elastic Axis](https://plugins.jenkins.io/elastic-axis) -This plugin is a power up for the multi configuration jobs allowing you to configure jobs to run on all slaves under a single label.Page: +This plugin is a power up for the multi configuration jobs allowing you to configure jobs to run on all agents under a single label. ### [NodeLabel Parameter Plugin](https://plugins.jenkins.io/nodelabelparameter) This plugin adds two new parameter types to job configuration - node and label, this allows to dynamically select the node where a job/project should be executed. diff --git a/src/main/resources/hudson/matrix/LabelAxis/help.html b/src/main/resources/hudson/matrix/LabelAxis/help.html index ae767d76..4e5127c6 100644 --- a/src/main/resources/hudson/matrix/LabelAxis/help.html +++ b/src/main/resources/hudson/matrix/LabelAxis/help.html @@ -1,5 +1,5 @@
- This axis lets you run the same build on multiple slaves (by specifying those slaves either by their labels + This axis lets you run the same build on multiple agents (by specifying those agents either by their labels or their individual names.) This is useful for example to cross-compile your C projects on multiple platforms, testing your Java projects on different OSes, and so on.
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html b/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html index 0dfdde3c..02129c52 100644 --- a/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html +++ b/src/main/resources/hudson/matrix/LabelAxis/help_zh_TW.html @@ -1,4 +1,4 @@
- 可以在不同 Slave 上建置作業的軸線 (可以依照標籤或是獨立名稱指定 Slave)。 + 可以在不同 Agent 上建置作業的軸線 (可以依照標籤或是獨立名稱指定 Agent)。 舉例來說，可以很方便的讓您在不同平台上編譯 C 專案，也可以在不同作業系統上測試 Java 專案。
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html b/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html index 140931ba..820e746e 100644 --- a/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html +++ b/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr.html @@ -1,4 +1,4 @@
-This is similar to "Slave" axis, but you can use label expressions, not just plain label names. +This is similar to the "Agent" axis, but you can use label expressions, not just plain label names. Each line represents one label expression (i.e. one value of this axis).
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html b/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html index ae6aebdf..9b797cb6 100644 --- a/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html +++ b/src/main/resources/hudson/matrix/LabelExpAxis/help-labelExpr_zh_TW.html @@ -1,4 +1,4 @@
-很像「Slave」軸，不過除了使用標籤名稱之外，您還可以用標籤表示式。 +很像「Agent」軸，不過除了使用標籤名稱之外，您還可以用標籤表示式。 一行代表一個表示式 (同時也是對應到軸線上的一個值)。
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/LabelExpAxis/help.html b/src/main/resources/hudson/matrix/LabelExpAxis/help.html index 3c6f14ff..e1cf69ab 100644 --- a/src/main/resources/hudson/matrix/LabelExpAxis/help.html +++ b/src/main/resources/hudson/matrix/LabelExpAxis/help.html @@ -1,4 +1,4 @@
- This axis lets you run the same build on multiple slaves (much like the "slaves" axis), - but this is more advanced in that it lets you use boolean expressions (such as foo&&bar) + This axis lets you run the same build on multiple agents (much like the "Agents" axis), + but this is more advanced in that it lets you use boolean expressions (such as foo&&bar)
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html b/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html index fa2d523e..e7f79fe5 100644 --- a/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html +++ b/src/main/resources/hudson/matrix/LabelExpAxis/help_zh_TW.html @@ -1,4 +1,4 @@
可以在多個節點上面執行相同建置的軸線。 - 很像「Slave」軸，但更進階。您可以用布林表示式 (例如 foo&&bar)。 + 很像「Agent」軸，但更進階。您可以用布林表示式 (例如 foo&&bar)。
\ No newline at end of file diff --git a/src/main/resources/hudson/matrix/Messages.properties b/src/main/resources/hudson/matrix/Messages.properties index 52fb183b..901ac073 100644 --- a/src/main/resources/hudson/matrix/Messages.properties +++ b/src/main/resources/hudson/matrix/Messages.properties @@ -38,7 +38,7 @@ MatrixConfiguration.Pronoun=Configuration MatrixConfiguration.DisableNotAllowed=Matrix configurations cannot be disabled separately. Disable the parent project instead JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves +LabelAxis.DisplayName=Agents LabelExpAxis.DisplayName=Label expression TextArea.DisplayName=User-defined Axis AxisDescriptor.EmptyAxisName=Axis name can not be empty diff --git a/src/main/resources/hudson/matrix/Messages_pt.properties b/src/main/resources/hudson/matrix/Messages_pt.properties index 8b4457ec..ce6aafaa 100644 --- a/src/main/resources/hudson/matrix/Messages_pt.properties +++ b/src/main/resources/hudson/matrix/Messages_pt.properties @@ -25,7 +25,7 @@ MatrixBuild.Completed={0} completado com resultado {1} TextArea.DisplayName=Eixo definido pelo usu\u00e1rio MatrixProject.DuplicateAxisName=Nome do eixo duplicado MatrixBuild.Triggering=Disparando {0} -LabelAxis.DisplayName=Slaves +LabelAxis.DisplayName=Agents JDKAxis.DisplayName=JDK MatrixBuild.Interrupting=Interrompendo {0} MatrixBuild.depends_on_this={0} depended disso. diff --git a/src/main/resources/hudson/matrix/Messages_pt_BR.properties b/src/main/resources/hudson/matrix/Messages_pt_BR.properties index c502e0ff..20ebd8b9 100644 --- a/src/main/resources/hudson/matrix/Messages_pt_BR.properties +++ b/src/main/resources/hudson/matrix/Messages_pt_BR.properties @@ -37,6 +37,6 @@ MatrixConfiguration.Pronoun=Configura\u00E7\u00E3o MatrixProject.DuplicateAxisName=Duplicar nome do eixo JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves +LabelAxis.DisplayName=Agents LabelExpAxis.DisplayName=Express\u00E3o de R\u00F3tulo TextArea.DisplayName=Eixo Definido pelo Usu\u00E1rio diff --git a/src/main/resources/hudson/matrix/Messages_zh_CN.properties b/src/main/resources/hudson/matrix/Messages_zh_CN.properties index b043d57b..332082a8 100644 --- a/src/main/resources/hudson/matrix/Messages_zh_CN.properties +++ b/src/main/resources/hudson/matrix/Messages_zh_CN.properties @@ -1,36 +1,36 @@ -# The MIT License -# -# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. - -MatrixProject.DisplayName=\u6784\u5EFA\u4E00\u4E2A\u591A\u914D\u7F6E\u9879\u76EE -MatrixProject.DuplicateAxisName=Duplicate axis name -MatrixProject.Description=\u9002\u7528\u4E8E\u591A\u914D\u7F6E\u9879\u76EE,\u4F8B\u5982\u591A\u73AF\u5883\u6D4B\u8BD5,\u5E73\u53F0\u6307\u5B9A\u6784\u5EFA,\u7B49\u7B49. - -MatrixBuild.Triggering=Triggering {0} -MatrixBuild.AppearsCancelled={0} appears to be cancelled -MatrixBuild.Cancelled=Cancelled {0} -MatrixBuild.Interrupting=Interrupting {0} - -MatrixConfiguration.Pronoun=Configuration - -JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slaves -TextArea.DisplayName=User-defined Axis +# The MIT License +# +# Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +MatrixProject.DisplayName=\u6784\u5EFA\u4E00\u4E2A\u591A\u914D\u7F6E\u9879\u76EE +MatrixProject.DuplicateAxisName=Duplicate axis name +MatrixProject.Description=\u9002\u7528\u4E8E\u591A\u914D\u7F6E\u9879\u76EE,\u4F8B\u5982\u591A\u73AF\u5883\u6D4B\u8BD5,\u5E73\u53F0\u6307\u5B9A\u6784\u5EFA,\u7B49\u7B49. + +MatrixBuild.Triggering=Triggering {0} +MatrixBuild.AppearsCancelled={0} appears to be cancelled +MatrixBuild.Cancelled=Cancelled {0} +MatrixBuild.Interrupting=Interrupting {0} + +MatrixConfiguration.Pronoun=Configuration + +JDKAxis.DisplayName=JDK +LabelAxis.DisplayName=Agents +TextArea.DisplayName=User-defined Axis diff --git a/src/main/resources/hudson/matrix/Messages_zh_TW.properties b/src/main/resources/hudson/matrix/Messages_zh_TW.properties index 4b8d2a1e..7eb12aeb 100644 --- a/src/main/resources/hudson/matrix/Messages_zh_TW.properties +++ b/src/main/resources/hudson/matrix/Messages_zh_TW.properties @@ -33,6 +33,6 @@ MatrixBuild.Completed={0} \u5DF2\u5B8C\u6210\uFF0C\u7D50\u679C\u70BA {1} MatrixConfiguration.Pronoun=\u8A2D\u5B9A JDKAxis.DisplayName=JDK -LabelAxis.DisplayName=Slave +LabelAxis.DisplayName=Agent LabelExpAxis.DisplayName=\u6A19\u7C64\u8868\u793A\u5F0F TextArea.DisplayName=\u4F7F\u7528\u8005\u81EA\u8A02\u8EF8 diff --git a/src/main/webapp/help/matrix/combinationfilter_de.html b/src/main/webapp/help/matrix/combinationfilter_de.html index 93bc8f07..9d5bb13d 100644 --- a/src/main/webapp/help/matrix/combinationfilter_de.html +++ b/src/main/webapp/help/matrix/combinationfilter_de.html @@ -14,7 +14,7 @@

Werte-basiertes Filtern

Beispiel: Sie bauen auf unterschiedlichen Betriebssystemen mit unterschiedlichen Compilern. - Ihre Slave-Knoten sind mit den Labels label=[linux,solaris] gekennzeichnet und Sie haben + Ihre Agent-Knoten sind mit den Labels label=[linux,solaris] gekennzeichnet und Sie haben eine Achse compiler=[gcc,cc] angelegt. Jeder der folgenden Ausdrücke wird Builds mit cc auf linux herausfiltern. Je nach diff --git a/src/main/webapp/help/matrix/combinationfilter_zh_TW.html b/src/main/webapp/help/matrix/combinationfilter_zh_TW.html index de9dd193..998ee2e2 100644 --- a/src/main/webapp/help/matrix/combinationfilter_zh_TW.html +++ b/src/main/webapp/help/matrix/combinationfilter_zh_TW.html @@ -9,7 +9,7 @@

依變數值篩選

假設您要在不同作業系統的不同編譯器上建置。 - 而您的 Slave 標籤有 label=[linux,solaris]，並建了 compiler=[gcc,cc] 這個軸線。 + 而您的 Agent 標籤有 label=[linux,solaris]，並建了 compiler=[gcc,cc] 這個軸線。 下列的每一個表式示都會過濾掉在 linux 上的 cc 建置。 差別在您怎麼看待這個限制，您可能會覺得某些方式就是比較直觀。 diff --git a/src/test/java/hudson/matrix/AxisTest.java b/src/test/java/hudson/matrix/AxisTest.java index 01a2c4b9..3221f116 100644 --- a/src/test/java/hudson/matrix/AxisTest.java +++ b/src/test/java/hudson/matrix/AxisTest.java @@ -63,7 +63,7 @@ public void submitEmptyAxisName() throws Exception { final String expectedMsg = "Matrix axis name '' is invalid: Axis name can not be empty"; assertFailedWith(expectedMsg, withName("", "User-defined Axis")); - assertFailedWith(expectedMsg, withName("", "Slaves")); + assertFailedWith(expectedMsg, withName("", "Agents")); assertFailedWith(expectedMsg, withName("", "Label expression")); } @@ -73,12 +73,12 @@ public void submitInvalidAxisName() throws Exception { String expectedMsg = "Matrix axis name 'a,b' is invalid: ‘,’ is an unsafe character"; assertFailedWith(expectedMsg, withName("a,b", "User-defined Axis")); - assertFailedWith(expectedMsg, withName("a,b", "Slaves")); + assertFailedWith(expectedMsg, withName("a,b", "Agents")); assertFailedWith(expectedMsg, withName("a,b", "Label expression")); expectedMsg = "Matrix axis name 'a=b' is invalid: ‘=’ is an unsafe character"; assertFailedWith(expectedMsg, withName("a=b", "User-defined Axis")); - assertFailedWith(expectedMsg, withName("a=b", "Slaves")); + assertFailedWith(expectedMsg, withName("a=b", "Agents")); assertFailedWith(expectedMsg, withName("a=b", "Label expression")); } @@ -100,7 +100,7 @@ public void submitInvalidAxisValue() throws Exception { @Test public void emptyAxisValueListResultInNoConfigurations() throws Exception { emptyValue("User-defined Axis"); - emptyValue("Slaves"); + emptyValue("Agents"); emptyValue("Label expression"); emptyValue("JDK");