2017-12-13 22:18:20,160 DEBUG zuul.Repo: Updating repository /var/lib/zuul/git/review.opencontrail.org/Juniper/contrail-controller
2017-12-13 22:18:25,654 DEBUG zuul.Repo: Checking out 64ad76f03262fa26a33098c636806a2559c95374
2017-12-13 22:18:26,588 DEBUG zuul.Repo: Merging refs/changes/80/38180/1 with args ['-s', 'resolve', 'FETCH_HEAD']
2017-12-13 22:18:28,571 DEBUG zuul.Merger: Unable to merge {'ref': 'refs/changes/80/38180/1', 'newrev': None, 'number': '38180', 'buildset_uuid': '63e6270c52aa469fa3914423385218e2', 'patchset': '1', 'project': 'Juniper/contrail-controller', 'branch': 'master', 'merge_mode': 2, 'connection': 'gerrit', 'oldrev': None}
Traceback (most recent call last):
  File "/usr/local/lib/python3.5/dist-packages/zuul/merger/merger.py", line 443, in _mergeChange
    commit = repo.merge(item['ref'], 'resolve')
  File "/usr/local/lib/python3.5/dist-packages/zuul/merger/merger.py", line 253, in merge
    repo.git.merge(*args)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 424, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 873, in _call_process
    return self.execute(call, **_kwargs)
  File "/usr/local/lib/python3.5/dist-packages/git/cmd.py", line 687, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(1)
  cmdline: git merge -s resolve FETCH_HEAD
  stdout: 'Trying really trivial in-index merge...
Nope.
Trying simple merge.
Simple merge failed, trying Automatic merge.
Auto-merging src/config/api-server/SConscript
Auto-merging src/config/api-server/test-requirements.txt
Auto-merging src/config/contrail_issu/SConscript
Auto-merging src/config/contrail_issu/test-requirements.txt
Auto-merging src/config/device-manager/SConscript
Auto-merging src/config/schema-transformer/SConscript
Auto-merging src/config/schema-transformer/test-requirements.txt
Auto-merging src/config/svc-monitor/SConscript
Auto-merging src/config/test/SConscript
Auto-merging src/config/vnc_openstack/SConscript
Auto-merging src/config/vnc_openstack/test-requirements.txt
Auto-merging src/container/cni/SConscript
Auto-merging src/container/kube-cni/SConscript
Auto-merging src/container/kube-manager/SConscript
Auto-merging src/container/kube-manager/test-requirements.txt
Auto-merging src/container/mesos-manager/SConscript
Auto-merging src/container/mesos-manager/test-requirements.txt
Automatic merge failed; fix conflicts and then commit the result.'
  stderr: 'error: Merge requires file-level merging
ERROR: src/config/api-server/tests/test_crud_basic.py: Not handling case 936c6e5c93c8ed410dc10e704502a965f190d9e6 -> faf33afbe6820c3c6bd1e8cd31bdf58a742ad982 ->
ERROR: src/config/api-server/tests/test_firewall.py: Not handling case 72c934be7ceba7e7ac1837942fb5f3f0c0e59fa6 -> 46722ab751fa09b2ecf861ab94c812ea37ae0621 ->
ERROR: src/config/api-server/tests/test_ip_alloc.py: Not handling case aad51c888bf3a91fc946afc332774914df6aa33c -> 5a67d5c42c9234fc38ded1fdecba310409eecc5a ->
ERROR: src/config/api-server/tests/test_perms2.py: Not handling case e4ac24bb544be73e2c63b410276d5ec6bc297950 -> b94517206419539d11de64779431f46f5d09a1b5 ->
ERROR: src/config/api-server/vnc_cfg_types.py: Not handling case bd6d99cefd86155c798b419e3beaac7593036b64 -> df96dcd2099937e0bd1d1d6042a0c6e0d5e694da ->
fatal: merge program failed'