Move rescue clause to branch creation method
What does this MR do?
In !37082 (merged)
we consolidated the trigger-build-docs script into the
trigger-build one. A new cancel_latest_pipeline! method was
created, but the rescue clause of the branch creation was misplaced.
It should actually be a part of create_remote_branch! instead.
If the trigger-build docs deploy job is run twice, it fails with https://gitlab.com/gitlab-org/gitlab/-/jobs/658181153.
/usr/local/bundle/gems/gitlab-4.13.0/lib/gitlab/request.rb:59:in `validate': Server responded with code 400, message: Branch already exists. Request URI: https://gitlab.com/api/v4/projects/gitlab%2Dorg%2Fgitlab%2Ddocs/repository/branches (Gitlab::Error::BadRequest)This MR should fix it.
Does this MR meet the acceptance criteria?
Conformity
-
Changelog entry -
Documentation (if required) -
Code review guidelines -
Merge request performance guidelines -
Style guides -
Database guides -
Separation of EE specific content
Availability and Testing
-
Review and add/update tests for this feature/bug. Consider all test levels. See the Test Planning Process. -
Tested in all supported browsers -
Informed Infrastructure department of a default or new setting change, if applicable per definition of done
Security
If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:
-
Label as security and @ mention @gitlab-com/gl-security/appsec -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team