You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2023/07/21 21:00:53 UTC
[solr] branch branch_9_3 updated: Release wizard fixes
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch branch_9_3
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9_3 by this push:
new e5f276af77b Release wizard fixes
e5f276af77b is described below
commit e5f276af77b0f17df9bba80ddb8aeb46c6163c5d
Author: Houston Putman <ho...@apache.org>
AuthorDate: Fri Jul 21 16:59:34 2023 -0400
Release wizard fixes
---
dev-tools/scripts/releaseWizard.py | 14 +++++++-------
dev-tools/scripts/releaseWizard.yaml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index 386a557b90b..bbfe9e802c7 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -115,7 +115,7 @@ def expand_jinja(text, vars=None):
'vote_close_72h': vote_close_72h_date().strftime("%Y-%m-%d %H:00 UTC"),
'vote_close_72h_epoch': unix_time_millis(vote_close_72h_date()),
'vote_close_72h_holidays': vote_close_72h_holidays(),
- 'solr_news_file': solr_news_file,
+ 'solr_news_file': state.get_solr_news_file(),
'load_lines': load_lines,
'set_java_home': set_java_home,
'latest_version': state.get_latest_version(),
@@ -630,6 +630,10 @@ class ReleaseState:
def get_java_cmd(self):
return os.path.join(self.get_java_home(), "bin", "java")
+ def get_solr_news_file(self):
+ return os.path.join(state.get_website_git_folder(), 'content', 'solr', 'solr_news',
+ "%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
+
def get_todo_states(self):
states = {}
if self.todos:
@@ -1319,10 +1323,6 @@ def main():
os.environ['JAVA_HOME'] = state.get_java_home()
os.environ['JAVACMD'] = state.get_java_cmd()
- global solr_news_file
- solr_news_file = os.path.join(state.get_website_git_folder(), 'content', 'solr', 'solr_news',
- "%s-%s-available.md" % (state.get_release_date_iso(), state.release_version.replace(".", "-")))
-
main_menu = ConsoleMenu(title="Solr ReleaseWizard",
subtitle=get_releasing_text,
prologue_text="Welcome to the release wizard. From here you can manage the process including creating new RCs. "
@@ -1885,9 +1885,9 @@ def vote_close_72h_holidays():
def prepare_announce_solr(todo): # pylint: disable=unused-argument
- if not os.path.exists(solr_news_file):
+ if not os.path.exists(state.get_solr_news_file()):
solr_text = expand_jinja("(( template=announce_solr ))")
- with open(solr_news_file, 'w') as fp:
+ with open(state.get_solr_news_file(), 'w') as fp:
fp.write(solr_text)
# print("Wrote Solr announce draft to %s" % solr_news_file)
else:
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index 027aab90d54..eafd4cd1621 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -866,7 +866,7 @@ groups:
SOLR_DOWNLOAD_SERVER={{ release_candidate_location }}/solr && \
docker build $SOLR_DOWNLOAD_SERVER/{{ release_version }}/docker/Dockerfile.official-full \
--build-arg SOLR_DOWNLOAD_SERVER=$SOLR_DOWNLOAD_SERVER \
- -t solr-rc:{{ release_version }}-{{ rc_number }}} && \
+ -t solr-rc:{{ release_version }}-{{ rc_number }} && \
docker build $SOLR_DOWNLOAD_SERVER/{{ release_version }}/docker/Dockerfile.official-slim \
--build-arg SOLR_DOWNLOAD_SERVER=$SOLR_DOWNLOAD_SERVER \
-t solr-rc:{{ release_version }}-{{ rc_number }}-slim