Skip to content

Commit bf30f85

Browse files
committed
rename built in node
1 parent 22e3191 commit bf30f85

File tree

8 files changed

+27
-5
lines changed

8 files changed

+27
-5
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: [3.6, 3.7, 3.8, 3.9]
12+
python-version: [3.6, 3.7, 3.8, 3.9, 3.10]
1313
os: [ubuntu-latest, macOS-latest, windows-latest]
1414
include:
1515
- python-version: pypy3

HISTORY.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Release History
22
===============
3+
1.8 (2021-12-??)
4+
-----------------
5+
- Rename built-in node as https://www.jenkins.io/doc/book/managing/built-in-node-migration/
6+
- Get parameters for job
7+
38
1.7 (2021-10-09)
49
-----------------
510
- `Jenkins.get_job` can accept job url now

api4jenkins/__version__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# -*- coding: utf-8 -*-
2-
__version__ = '1.7'
2+
__version__ = '1.8'
33
__title__ = 'api4jenkins'
44
__description__ = 'Jenkins Python Client'
55
__url__ = 'https://github.com/joelee2012/api4jenkins'
66
__author__ = 'Joe Lee'
77
__author_email__ = 'lj_2005@163.com'
88
__license__ = 'Apache 2.0'
9-
__copyright__ = 'Copyright 2021 Joe Lee'
9+
__copyright__ = 'Copyright 2022 Joe Lee'
1010
__documentation__ = 'https://api4jenkins.readthedocs.io'

api4jenkins/job.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,13 @@ def set_next_build_number(self, number):
150150
self.handle_req('POST', 'nextbuildnumber/submit',
151151
params={'nextBuildNumber': number})
152152

153+
def get_parameters(self):
154+
params = []
155+
for p in self.api_json()['property']:
156+
if 'parameterDefinitions' in p:
157+
params = p['parameterDefinitions']
158+
return params
159+
153160
@property
154161
def building(self):
155162
builds = self.api_json(tree='builds[building]')['builds']

api4jenkins/node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def __iter__(self):
106106

107107
class MasterComputer(Node):
108108
def __init__(self, jenkins, url):
109-
super().__init__(jenkins, re.sub(r'/master/$', '/(master)/', url))
109+
super().__init__(jenkins, re.sub(r'/Built-In Node/$', '/(built-in)/', url))
110110

111111

112112
class SlaveComputer(Node):

api4jenkins/utils.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,8 @@ def filter_job_build_by_result(job, *, result):
3333
if result not in expect:
3434
raise ValueError(f'Expect one of {expect}')
3535
yield from filter(lambda build: build.result == result, job)
36+
37+
38+
def iter_all_builds(job):
39+
for item in job.api_json(tree='allBuilds[number,url]')['allBuilds']:
40+
yield job._new_instance_by_item('api4jenkins.build', item)

docs/source/user/example.rst

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,10 @@ build with parameters
299299

300300
>>> item = job.build(arg1='string1', arg2='string2')
301301

302+
get job parameters
303+
304+
>>> parameters = job.get_parameters()
305+
302306
disable/enable project to
303307

304308
>>> job.disable()
@@ -336,7 +340,7 @@ set next build number (requires `next-build-number` plugin)
336340

337341
>>> job.set_next_build_number(1)
338342

339-
iterate all builds of this project, following are same
343+
iterate builds(latest 100 builds) of this project, following are same
340344

341345
>>> for build in job:
342346
... print(build)

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
'Programming Language :: Python :: 3.7',
4343
'Programming Language :: Python :: 3.8',
4444
'Programming Language :: Python :: 3.9',
45+
'Programming Language :: Python :: 3.10',
4546
'Topic :: Software Development',
4647
],
4748
project_urls={

0 commit comments

Comments
 (0)