[Qa-jenkins-scm] Build failed in Jenkins: janitor-worker #1595

[jenkins at jenkins.debian.net]

See <https://jenkins.debian.net/job/janitor-worker/1595/display/redirect>

Changes:


------------------------------------------
Started by timer
Running as SYSTEM
[EnvInject] - Loading node environment variables.
Building remotely on osuosl-build167-amd64.debian.net (osuosl167 amd64) in workspace <https://jenkins.debian.net/job/janitor-worker/ws/>
[janitor-worker] $ /bin/sh -xe /tmp/jenkins14366144156694362082.sh
+ /srv/jenkins/bin/jenkins_master_wrapper.sh
Opening branch at https://salsa.debian.org/pkg-security-team/openvas-manager.git/
Using cached branch https://janitor.debian.net/git/openvas-manager/
52)
Total 483 (delta 298), reused 401 (delta 227), pack-reused 0
Elapsed time: 0:00:22.900588
Traceback (most recent call last):
  File "/usr/lib/python3.7/runpy.py", line 193, in _run_module_as_main
    "__main__", mod_spec)
  File "/usr/lib/python3.7/runpy.py", line 85, in _run_code
    exec(code, run_globals)
  File "/srv/janitor/debian-janitor/janitor/pull_worker.py", line 436, in <module>
    sys.exit(asyncio.run(main()))
  File "/usr/lib/python3.7/asyncio/runners.py", line 43, in run
    return loop.run_until_complete(main)
  File "/usr/lib/python3.7/asyncio/base_events.py", line 584, in run_until_complete
    return future.result()
  File "/srv/janitor/debian-janitor/janitor/pull_worker.py", line 396, in main
    possible_transports=possible_transports))
  File "/usr/lib/python3.7/concurrent/futures/thread.py", line 57, in run
    result = self.fn(*self.args, **self.kwargs)
  File "/srv/janitor/debian-janitor/janitor/pull_worker.py", line 173, in run_worker
    possible_transports=possible_transports) as (ws, result):
  File "/usr/lib/python3.7/contextlib.py", line 112, in __enter__
    return next(self.gen)
  File "/srv/janitor/debian-janitor/janitor/worker.py", line 866, in process_package
    pick_additional_colocated_branches(main_branch))) as ws:
  File "/srv/janitor/debian-janitor/silver-platter/silver_platter/proposal.py", line 305, in __enter__
    self.resume_branch or self.main_branch, overwrite=True)
  File "/srv/janitor/debian-janitor/breezy/breezy/git/workingtree.py", line 1229, in pull
    show_base=show_base)
  File "/srv/janitor/debian-janitor/breezy/breezy/git/workingtree.py", line 1215, in _update_git_tree
    show_base=show_base)
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 1915, in merge_inner
    return merger.do_merge()
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 659, in do_merge
    merge = self._do_merge_to()
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 628, in _do_merge_to
    merge.do_merge()
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 763, in do_merge
    self._compute_transform()
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 806, in _compute_transform
    self._finish_computing_transform()
  File "/srv/janitor/debian-janitor/breezy/breezy/merge.py", line 816, in _finish_computing_transform
    lambda t, c: transform.conflict_pass(t, c, self.other_tree))
  File "/srv/janitor/debian-janitor/breezy/breezy/transform.py", line 3097, in resolve_conflicts
    raise MalformedTransform(conflicts=conflicts)
breezy.transform.MalformedTransform: Tree transform is malformed [('unversioned executability', 'new-56'), ('unversioned executability', 'new-118'), ('unversioned executability', 'new-260'), ('unversioned executability', 'new-261')]

SSH EXIT CODE: 1
Build step 'Execute shell' marked build as failure