Details
-
Bug
-
Resolution: Won't Do
-
Not Evaluated
-
None
-
production
-
None
Description
On occasion, the submodule update bot will push a change for qt5 submodule updates, but fail to reset. When this happens, the next run of the bot causes it to try to upload a new patchset of the qt5 update to the existing change, which may be closed if it has previously merged successfully. This error case needs to be handled gracefully and reset the bot if it detects that the current round has completed.
Example:
Summary of git repository dependency update for target branch 6.1.0 based off of qt/qt5
No updates are necessary for any modules - everything is up-to-date
Preparing qt5 update
2021/04/21 13:22:22 Running gerrit ssh command: 'ssh [-i coin-secrets/submodule_update_bot_key_rsa -oBatchMode=yes qt_submodule_update_bot@codereview.qt-project.org -p 29418 gerrit query --patch-sets --format JSON project:qt/qt5 branch:6.1.0 NOT(status:merged OR status:abandoned OR status:deferred) owner:self message:{Update dependencies on \'6.1.0\' in qt/qt5}]'
Created new commit for submodule update: 41ba56baf67f9449bb2734eca5f203568729968b
2021/04/21 13:22:25 Error: error preparing qt5 update: Error pushing qt5 change: Error running git --git-dir=git-repos/qt/qt5 push ssh://qt_submodule_update_bot@codereview.qt-project.org:29418/qt/qt5 41ba56baf67f9449bb2734eca5f203568729968b:refs/for/6.1.0: exit status 1
Stdout:
Stderr: remote:
remote: Processing changes: refs: 1
remote: Processing changes: refs: 1, done
To ssh://codereview.qt-project.org:29418/qt/qt5
! [remote rejected] 41ba56baf67f9449bb2734eca5f203568729968b -> refs/for/6.1.0 (change https://codereview.qt-project.org/c/qt/qt5/+/344471 closed)
error: failed to push some refs to 'ssh://qt_submodule_update_bot@codereview.qt-project.org:29418/qt/qt5'