Skip to content

The PatchIssue title should always use the CE version string

Robert Speicher requested to merge rs-fix-ee-prep-mr into master

Resolves this error:

release-tools master % bundle exec rake "patch_merge_request[10.6.1]"
--> Merge Request "WIP: Prepare 10.6.1 release" created.
    https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17938
rake aborted!
NoMethodError: undefined method `web_url' for nil:NilClass
/Users/rspeicher/Code/gitlab/release-tools/lib/issuable.rb:41:in `url'
/Users/rspeicher/Code/gitlab/release-tools/lib/preparation_merge_request.rb:23:in `main_release_issue_url'
(erb):1:in `description'
/Users/rspeicher/Code/gitlab/release-tools/lib/issuable.rb:11:in `description'
/Users/rspeicher/Code/gitlab/release-tools/lib/gitlab_client.rb:114:in `create_merge_request'
/Users/rspeicher/Code/gitlab/release-tools/lib/merge_request.rb:18:in `create'
/Users/rspeicher/Code/gitlab/release-tools/lib/support/tasks_helper.rb:43:in `create_or_show_issuable'
/Users/rspeicher/Code/gitlab/release-tools/lib/support/tasks_helper.rb:54:in `create_or_show_merge_request'
/Users/rspeicher/Code/gitlab/release-tools/Rakefile:104:in `block in <top (required)>'
Tasks: TOP => patch_merge_request
(See full trace by running task with --trace)

4e205a40 - Don't exit early with an error status if the issuable exists

This isn't really an error status all the time; it can be valid for an issue to already exist, and in the case of an interrupted patch_merge_request task, we can move on to the EE version if necessary.

97fb6544 - The PatchIssue title should always use the CE version string

When patch_merge_request was passing the EE version string, we'd fail looking up the original release issue, because it didn't have the -ee suffix.

Merge request reports