Cleanup: Remove dead codepath related on rsync step
It was not used for a while, and it's not possible to rsync to the server. The reason why rsync step existed is because of upload performance. But if FileUpload step is really not so much performant it is to be fixed on Buildbot project side (or re-configured on our side to give more suitable blocksize).
This commit is contained in:
20
master.cfg
20
master.cfg
@@ -182,8 +182,7 @@ c['builders'] = []
|
|||||||
|
|
||||||
# Add builder utility.
|
# Add builder utility.
|
||||||
|
|
||||||
def add_builder(c, name, platforms, factory, branch='',
|
def add_builder(c, name, platforms, factory, branch='', hour=3, minute=0):
|
||||||
rsync=False, hour=3, minute=0):
|
|
||||||
for platform in platforms:
|
for platform in platforms:
|
||||||
workernames = []
|
workernames = []
|
||||||
builder_name = f'{name}_{platform}'
|
builder_name = f'{name}_{platform}'
|
||||||
@@ -194,7 +193,7 @@ def add_builder(c, name, platforms, factory, branch='',
|
|||||||
builder_name = f"{worker['platform_short']}_{name}"
|
builder_name = f"{worker['platform_short']}_{name}"
|
||||||
|
|
||||||
if workernames:
|
if workernames:
|
||||||
f = factory(builder_name, branch, rsync)
|
f = factory(builder_name, branch)
|
||||||
c['builders'].append(BuilderConfig(name=builder_name,
|
c['builders'].append(BuilderConfig(name=builder_name,
|
||||||
workernames=workernames,
|
workernames=workernames,
|
||||||
factory=f,
|
factory=f,
|
||||||
@@ -225,25 +224,15 @@ def git_step(branch=''):
|
|||||||
submodules=True)
|
submodules=True)
|
||||||
|
|
||||||
|
|
||||||
def rsync_step(python_command, id, branch, rsync_script):
|
|
||||||
return ShellCommand(name='rsync',
|
|
||||||
command=[python_command, rsync_script, id, branch],
|
|
||||||
description='uploading',
|
|
||||||
descriptionDone='uploaded',
|
|
||||||
workdir='install',
|
|
||||||
haltOnFailure=True)
|
|
||||||
|
|
||||||
|
|
||||||
# Generic builder.
|
# Generic builder.
|
||||||
|
|
||||||
def generic_builder(id, branch='', rsync=False):
|
def generic_builder(id, branch=''):
|
||||||
# TODO(sergey): Consider using pathlib.
|
# TODO(sergey): Consider using pathlib.
|
||||||
filename = f'uploaded/buildbot_upload_{id}.zip'
|
filename = f'uploaded/buildbot_upload_{id}.zip'
|
||||||
update_script = '../blender.git/build_files/buildbot/slave_update.py'
|
update_script = '../blender.git/build_files/buildbot/slave_update.py'
|
||||||
compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
|
compile_script = '../blender.git/build_files/buildbot/slave_compile.py'
|
||||||
test_script = '../blender.git/build_files/buildbot/slave_test.py'
|
test_script = '../blender.git/build_files/buildbot/slave_test.py'
|
||||||
pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
|
pack_script = '../blender.git/build_files/buildbot/slave_pack.py'
|
||||||
rsync_script = '../blender.git/build_files/buildbot/slave_rsync.py'
|
|
||||||
unpack_script = 'master_unpack.py'
|
unpack_script = 'master_unpack.py'
|
||||||
|
|
||||||
# NOTE: On Windows never includes major version in the executable name,
|
# NOTE: On Windows never includes major version in the executable name,
|
||||||
@@ -277,9 +266,6 @@ def generic_builder(id, branch='', rsync=False):
|
|||||||
descriptionDone='packaged',
|
descriptionDone='packaged',
|
||||||
haltOnFailure=True))
|
haltOnFailure=True))
|
||||||
|
|
||||||
if rsync:
|
|
||||||
f.addStep(rsync_step(python_command, id, git_branch, rsync_script))
|
|
||||||
else:
|
|
||||||
f.addStep(FileUpload(name='upload',
|
f.addStep(FileUpload(name='upload',
|
||||||
workersrc='buildbot_upload.zip',
|
workersrc='buildbot_upload.zip',
|
||||||
masterdest=filename,
|
masterdest=filename,
|
||||||
|
Reference in New Issue
Block a user