Hello everyone,
I'm trying to make a promote pipeline, using the supercedent pipeline manager. I added a simple job just to see that it works, and it doesn't. The message in Gerrit is "Merge Failed", which I didn't expect from a post-merge pipeline. I thought it would just check out the commit in question and run the job. Do I need to tell it to do that? My pipeline configuration for the promote pipeline is based on this: https://zuul-ci.org/docs/zuul/reference/drivers/gerrit.html#reference-pipeli...
The project is running with "merge-mode: cherry-pick", but for changes that are already merged, I didn't expect any extra cherry-picking. How is this supposed to work?
I'm running Zuul 4.3.0.
Scheduler log says:
2021-09-20 12:44:19,779 DEBUG zuul.Pipeline.embedl-tenant.promote: [e: 6d632d0932ab48189dc4f91098670f68] <QueueItem 98818e7cef9f43ca8aa492387d772bd7 for <Change 0x7fdf74331a90 embedl 1174,2> in promote> is a failing item because ['it has a merge conflict']
Executor log says:
2021-09-20 12:44:17,771 DEBUG zuul.Merger: [e: 6d632d0932ab48189dc4f91098670f68] Unable to merge {'project': 'embedl', 'connection': 'gerrit', 'merge_mode': 3, 'ref': 'refs/changes/74/1174/2', 'branch': 'work/promotebranch', 'buildset_uuid': 'e2ccdf93250047578dba0ea8adf7b82f', 'number': '1174', 'patchset': '2', 'oldrev': None, 'newrev': None} Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/zuul/merger/merger.py", line 1000, in _mergeChange commit = repo.cherryPick(item['ref'], File "/usr/local/lib/python3.8/site-packages/zuul/merger/merger.py", line 541, in cherryPick repo.git.cherry_pick("FETCH_HEAD") File "/usr/local/lib/python3.8/site-packages/git/cmd.py", line 588, in <lambda> return lambda *args, **kwargs: self._call_process(name, *args, **kwargs) File "/usr/local/lib/python3.8/site-packages/git/cmd.py", line 1134, in _call_process return self.execute(call, **exec_kwargs) File "/usr/local/lib/python3.8/site-packages/git/cmd.py", line 931, in execute raise GitCommandError(redacted_command, status, stderr_value, stdout_value) git.exc.GitCommandError: Cmd('git') failed due to: exit code(1) cmdline: git cherry-pick FETCH_HEAD stdout: 'Not currently on any branch. You are currently cherry-picking commit fe48d19.
nothing to commit, working tree clean' stderr: 'The previous cherry-pick is now empty, possibly due to conflict resolution. If you wish to commit it anyway, use:
git commit --allow-emptyOtherwise, please use 'git reset''
Best regards, Christian von Schultz