Apache Solr open-source search software
Make fixes for release wizard
Houston Putmana2f656541566
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.pyindex 386d8e6a1ff..386a557b90b 100755--- a/dev-tools/scripts/releaseWizard.py+++ b/dev-tools/scripts/releaseWizard.py@@ -102,6 +102,7 @@ def expand_jinja(text, vars=None):'release_version_minor': state.release_version_minor,'release_version_bugfix': state.release_version_bugfix,'release_version_refguide': state.get_refguide_release() ,+ 'release_version_jira': state.get_jira_release(),'state': state,'gpg_key' : state.get_gpg_key(),'gradle_cmd' : 'gradlew.bat' if is_windows() else './gradlew',@@ -604,6 +605,13 @@ class ReleaseState:def get_refguide_release(self):return "%s_%s" % (self.release_version_major, self.release_version_minor)+ def get_jira_release(self):+ if self.release_type == 'major' or self.release_type == 'minor':+ return "%s.%s" % (self.release_version_major, self.release_version_minor)+ if self.release_type == 'bugfix':+ return "%s.%s.%s" % (self.release_version_major, self.release_version_minor, self.release_version_bugfix)+ return None+def get_java_home(self):return self.get_java_home_for_version(self.release_version)diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex 66e2119a68a..502aa51bbaa 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -562,7 +562,7 @@ groups:while the branch feature freeze is in effect, think twice: can't theaddition wait a couple more days? Merges of bug fixes into the branchmay become more difficult.- * Only Jira issues with Fix version {{ release_version_major }}.{{ release_version_minor }} and priority "Blocker" will delay+ * Only Jira issues with Fix version {{ release_version_jira }} and priority "Blocker" will delaya release candidate build.----types:@@ -590,12 +590,12 @@ groups:* Before committing to the branch, reply to this thread and arguewhy the fix needs backporting and how long it will take.- * All issues accepted for backporting should be marked with {{ release_version }}+ * All issues accepted for backporting should be marked with {{ release_version_jira }}in JIRA, and issues that should delay the release must be marked as Blocker* All patches that are intended for the branch should first be committedto the unstable branch, merged into the stable branch, and then intothe current release branch.- * Only Jira issues with Fix version {{ release_version }} and priority "Blocker" will delay+ * Only Jira issues with Fix version {{ release_version_jira }} and priority "Blocker" will delaya release candidate build.----types:@@ -1298,6 +1298,10 @@ groups:Edit a news text for the Solr website. This text will be the basis for the release announcement email later.This step will open an editor with a template. You will need to copy/paste the final release announcement textfrom the Wiki page and format it as Markdown.++ If the created file contains `yyyy-mm-dd`, then quit the release wizard and run it again.+ The release wizard must be re-started (not initialized again, you want to keep all of the state),+ in order for the release date variable to be populated.function: prepare_announce_solrcommands: !Commandsroot_folder: '{{ git_website_folder }}'@@ -1361,7 +1365,7 @@ groups:cmd: git checkout main && git statusstdout: true- !Command- cmd: git diff+ cmd: git diff origin/mainredirect: "{{ [release_folder, 'website.diff'] | path_join }}"comment: Make a diff of all edits. Will open in next step- !Command@@ -1408,11 +1412,11 @@ groups:Verify on https://solr.apache.org that the site is OK.- You can now also verify that https://solr.apache.org/api/solr-core/ redirects to the latest version+ You can now also verify that https://solr.apache.org/api/core/ redirects to the latest versionlinks:- https://ci2.apache.org/#/builders/3- https://solr.apache.org- - https://solr.apache.org/api/solr-core/+ - https://solr.apache.org/api/core/- !Todoid: update_doaptitle: Update the DOAP file@@ -1521,11 +1525,29 @@ groups:id: add_to_wikipediatitle: Add the new version to Wikipediadescription: |- Go to Wikipedia and edit the page to include the new release.- Major versions should have a small new paragraph under 'History'.- If you know other languages than English, edit those as well.+ Go to Wikidata and edit the page to include the new release.++ - Scroll down to the "software version identifier" section.+ - Click "add value"+ - Type {{ release_version }}+ - Add Qualifiers+ - Click "add qualifier"+ - Choose the qualifier publication date+ - Input the correct value+ - Add a reference+ - Click "add reference"+ - in "Property", type "reference url", and click the auto-complete box.+ - For the value, go to the solr news page, https://solr.apache.org/news.html, and get the link to the Solr {{ release_version }} section.+ - Set this as the latest release+ - To the left of the version number text box there should be an up arrow, a circle and a down arrow.+ Click these and select "Preferred rank"+ - Hit publish next to the first text box.+ - Make sure the previous release is no longer "latest"+ - Click "edit" on the previous version that is highlighted in green.+ - Click the ranking next to the version name, and change it from "Preferred rank" to "Normal rank"+ - Click "publish" for this past releaselinks:- - https://en.wikipedia.org/wiki/Apache_Solr+ - https://www.wikidata.org/wiki/Q2858103- !Todoid: add_to_apache_reportertitle: Add the new version to the Apache Release Reporter@@ -1659,7 +1681,7 @@ groups:description: |-Go to the JIRA "Manage Versions" Administration pages.- . Next to version {{ release_version }}, click the gear pop-up menu icon and choose "Release"+ . Next to version {{ release_version_jira }}, click the gear pop-up menu icon and choose "Release". Fill in the release date ({{ release_date | formatdate }}). It will give the option of transitioning issues marked fix-for the released version to thenext version, but do not do this as it will send an email for each issue :)@@ -1672,26 +1694,26 @@ groups:Go to JIRA search to find all issues that were fixed in the releaseyou just made, whose Status is Resolved.- . Go to https://issues.apache.org/jira/issues/?jql=project+in+(SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version }}+ . Go to https://issues.apache.org/jira/issues/?jql=project+in+(SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version_jira }}. Do a bulk change (Under Tools... menu) to close all of these issues. This is a workflow transition task. In the 'Comment' box type `Closing after the {{ release_version }} release`. *Uncheck* the box that says `Send mail for this update`links:- - https://issues.apache.org/jira/issues/?jql=project+in+(SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version }}+ - https://issues.apache.org/jira/issues/?jql=project+in+(SOLR)+AND+status=Resolved+AND+fixVersion={{ release_version_jira }}- !Todoid: jira_change_unresolvedtitle: Remove fixVersion for unresolveddescription: |-- Do another JIRA search to find all issues with Resolution=_Unresolved_ and fixVersion=_{{ release_version }}_.+ Do another JIRA search to find all issues with Resolution=_Unresolved_ and fixVersion=_{{ release_version_jira }}_.- . Open https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}+ . Open https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version_jira }}. In the `Tools` menu, start a bulk change - operation="Edit issues". Identify issues that *are included* in the release, but are unresolved e.g. due to being REOPENED. These shall *not* be bulk changed!- . Check the box next to `Change Fix Version/s` and in the dropdown `Find and remove these`, selecting v {{ release_version }}+ . Check the box next to `Change Fix Version/s` and in the dropdown `Find and remove these`, selecting v {{ release_version_jira }}. On the bottom of the form, uncheck the box that says `Send mail for this update`. Click `Next`, review the changes and click `Confirm`links:- - https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version }}+ - https://issues.apache.org/jira/issues/?jql=project+=+SOLR+AND+resolution=Unresolved+AND+fixVersion={{ release_version_jira }}- !Todoid: jira_clear_securitytitle: Clear Security Level of Public Solr JIRA Issues@@ -1754,6 +1776,6 @@ groups:comment: Delete from Lucene dist area- !Commandcmd: |- svn rm -m "Stop publishing old Solr releases"{% for ver in mirrored_versions_to_delete %} https://dist.apache.org/repos/dist/release/solr/{{ ver }}{% endfor %}+ svn rm -m "Stop publishing old Solr releases"{% for ver in mirrored_versions_to_delete %} https://dist.apache.org/repos/dist/release/solr/solr/{{ ver }}{% endfor %}logfile: svn-rm-solr.logcomment: Delete from new Solr dist area