Skip to content

Commit 5e565ce

Browse files
mgedmingaborbernat
authored andcommitted
Jenkins 2.0 renamed "slave" to "agent" (#1240)
See e.g. https://issues.jenkins-ci.org/browse/JENKINS-42816
1 parent 5d5c679 commit 5e565ce

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/changelog.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ v1.0
13991399
for test commands (thanks Chris Rose)
14001400
- fix `#22 <https://github.com/tox-dev/tox/issues/22>`_: require virtualenv-1.6.1, obsoleting virtualenv5 (thanks Jannis Leidel)
14011401
and making things work with pypy-1.5 and python3 more seamlessly
1402-
- toxbootstrap.py (used by jenkins build slaves) now follows the latest release of virtualenv
1402+
- toxbootstrap.py (used by jenkins build agents) now follows the latest release of virtualenv
14031403
- fix `#20 <https://github.com/tox-dev/tox/issues/20>`_: document format of URLs for specifying dependencies
14041404
- fix `#19 <https://github.com/tox-dev/tox/issues/19>`_: substitute Hudson for Jenkins everywhere following the renaming
14051405
of the project. NOTE: if you used the special [tox:hudson]

docs/example/jenkins.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Using Jenkins multi-configuration jobs
66

77
The Jenkins_ continuous integration server allows to define "jobs" with
88
"build steps" which can be test invocations. If you :doc:`install <../install>` ``tox`` on your
9-
default Python installation on each Jenkins slave, you can easily create
9+
default Python installation on each Jenkins agent, you can easily create
1010
a Jenkins multi-configuration job that will drive your tox runs from the CI-server side,
1111
using these steps:
1212

@@ -42,7 +42,7 @@ for example with ``pytest`` it is done like this:
4242
4343
4444
45-
**zero-installation** for slaves
45+
**zero-installation** for agents
4646
-------------------------------------------------------------
4747

4848
.. note::
@@ -51,7 +51,7 @@ for example with ``pytest`` it is done like this:
5151
has been removed. Please file an issue if you'd like to
5252
see it back.
5353

54-
If you manage many Jenkins slaves and want to use the latest officially
54+
If you manage many Jenkins agents and want to use the latest officially
5555
released tox (or latest development version) and want to skip manually
5656
installing ``tox`` then substitute the above **Python build step** code
5757
with this:

0 commit comments

Comments
 (0)