Apache Solr open-source search software
SOLR-15852 Fix release-folder syntax
Jan Høydahla64fcd80d590
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yamlindex 4e5d41105f4..b64382f341c 100644--- a/dev-tools/scripts/releaseWizard.yaml+++ b/dev-tools/scripts/releaseWizard.yaml@@ -692,7 +692,7 @@ groups:title: Run the smoke testerdepends: build_rcvars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'tmp_dir: '{{ [rc_folder, ''smoketest''] | path_join }}'local_keys: '{% if keys_downloaded %} --local-keys "{{ [config_path, ''KEYS''] | path_join }}"{% endif %}'@@ -712,7 +712,7 @@ groups:Here we'll import the artifacts into Subversion.depends: smoke_testervars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'dist_url: '{{ dist_url_base }}/{{ dist_folder}}'commands: !Commands@@ -731,7 +731,7 @@ groups:area and checks hash and signatures, but does not re-run all tests.depends: import_svnvars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}dist_url: '{{ dist_url_base }}/{{ dist_folder}}'tmp_dir: '{{ [rc_folder, ''smoketest_staged''] | path_join }}'local_keys: '{% if keys_downloaded %} --local-keys "{{ [config_path, ''KEYS''] | path_join }}"{% endif %}'@@ -765,12 +765,12 @@ groups:Please vote for release candidate {{ rc_number }} for Solr {{ release_version }}The artifacts can be downloaded from:- {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}You can run the smoke tester directly with this command:python3 -u dev-tools/scripts/smokeTestRelease.py \- {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}The vote will be open for at least 72 hours i.e. until {{ vote_close }}.@@ -891,7 +891,7 @@ groups:id: rm_staged_mvntitle: Delete mvn and docker artifacts from staging repovars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}dist_path: '{{ [dist_file_path, dist_folder] | path_join }}'dist_stage_url: '{{ dist_url_base }}/{{ dist_folder}}'commands: !Commands@@ -907,7 +907,7 @@ groups:id: mv_to_releasetitle: Move release artifacts to release repovars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}dist_stage_url: '{{ dist_url_base }}/{{ dist_folder}}'dist_release_url: https://dist.apache.org/repos/dist/release/solrcommands: !Commands@@ -920,7 +920,7 @@ groups:logfile: svn_mv_solr.logtee: true- !Command- cmd: svn rm -m "Clean up the RC folder for {{ release_version }} RC{{ rc_number }}" {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ cmd: svn rm -m "Clean up the RC folder for {{ release_version }} RC{{ rc_number }}" {{ dist_url_base }}/solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}logfile: svn_rm_containing.logcomment: Clean up containing folder on the staging repotee: true@@ -929,7 +929,7 @@ groups:id: stage_maventitle: Stage the maven artifacts for publishingvars:- dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev{{ build_rc.git_rev | default("<git_rev>", True) }}+ dist_folder: solr-{{ release_version }}-RC{{ rc_number }}-rev-{{ build_rc.git_rev | default("<git_rev>", True) }}commands: !Commandsroot_folder: '{{ git_checkout_folder }}'confirm_each_command: true