From 37abcb737fdcf5c7275bdcdef312a80d4e221460 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 15 Jul 2024 18:15:37 +0200 Subject: [PATCH 1/2] Move Redmine steps until after tagging Until a release has been tagged, things can still be added and the bot could set the wrong Fixed in Release values. --- procedures/foreman/release.md.erb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/procedures/foreman/release.md.erb b/procedures/foreman/release.md.erb index 1abb79b..4012290 100644 --- a/procedures/foreman/release.md.erb +++ b/procedures/foreman/release.md.erb @@ -17,14 +17,8 @@ ## Release Owner -<% unless is_rc -%> -- [ ] Add a new [Redmine version](https://projects.theforeman.org/projects/foreman/settings/versions) for the next minor, unless the series is EOL. Be sure the version is set to sharing with subprojects. -<% end -%> - [ ] Remove/change target version field for any open Redmine tickets assigned to the release still (next minor, unset it or reject) - [ ] Ensure that code in git matches issues fixed in <%= full_version %> in redmine. [issues](https://github.com/theforeman/theforeman-rel-eng/blob/master/issues) can be used to generate a comparison between the two. -<% unless is_rc -%> -- [ ] Change Redmine version <%= full_version %> state to Closed using <%= rel_eng_script('close_redmine_version') %> -<% end -%> # Tagging a release: <%= target_date %> @@ -42,6 +36,10 @@ - [ ] Create tags using <%= rel_eng_script('tag_project') %> - [ ] Push tags using <%= rel_eng_script('tag_push') %> - [ ] Run the Jenkins [Tarballs Release](https://ci.theforeman.org/job/tarballs-release/) using <%= rel_eng_script('release_tarballs') %> to create tarballs +<% unless is_rc -%> +- [ ] Change Redmine version <%= full_version %> state to Closed using <%= rel_eng_script('close_redmine_version') %> +- [ ] Add a new [Redmine version](https://projects.theforeman.org/projects/foreman/settings/versions) for the next minor, unless the series is EOL. Be sure the version is set to sharing with subprojects. +<% end -%> ## Release Engineer From 79eeca7503a515eed94e75ba80a83a07f0229703 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Mon, 15 Jul 2024 18:17:26 +0200 Subject: [PATCH 2/2] Move the check for open PRs to the code preparation step This keeps the tagging step to just tagging. --- procedures/foreman/release.md.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/procedures/foreman/release.md.erb b/procedures/foreman/release.md.erb index 4012290..453b536 100644 --- a/procedures/foreman/release.md.erb +++ b/procedures/foreman/release.md.erb @@ -19,12 +19,12 @@ - [ ] Remove/change target version field for any open Redmine tickets assigned to the release still (next minor, unset it or reject) - [ ] Ensure that code in git matches issues fixed in <%= full_version %> in redmine. [issues](https://github.com/theforeman/theforeman-rel-eng/blob/master/issues) can be used to generate a comparison between the two. +- [ ] Check for open pull requests in [Foreman](https://github.com/theforeman/foreman/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable), [smart-proxy](https://github.com/theforeman/smart-proxy/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable), [foreman-installer](https://github.com/theforeman/foreman-installer/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable) and [foreman-selinux](https://github.com/theforeman/foreman-selinux/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable) # Tagging a release: <%= target_date %> ## Release Owner -- [ ] Check for open pull requests in [Foreman](https://github.com/theforeman/foreman/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable), [smart-proxy](https://github.com/theforeman/smart-proxy/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable), [foreman-installer](https://github.com/theforeman/foreman-installer/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable) and [foreman-selinux](https://github.com/theforeman/foreman-selinux/pulls?q=is%3Apr+is%3Aopen+branch%3A<%= short_version %>-stable) - [ ] Make sure [test_<%= short_version.tr('.', '_') %>_stable](https://ci.theforeman.org/job/test_<%= short_version.tr('.', '_') %>_stable/) and [smart-proxy<%= short_version %>-stable-test](https://ci.theforeman.org/job/smart-proxy-<%= short_version %>-stable-test/) are green using <%= rel_eng_script('verify_green_jobs') %> <% if is_rc || is_first_ga -%> - [ ] Run `make -C locale tx-update` in foreman <%= short_version %>-stable