From 9d4081073ccd67570985f5a9922ff30d3f2e57b6 Mon Sep 17 00:00:00 2001
From: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Date: Thu, 19 Dec 2024 10:11:58 -0700
Subject: [PATCH] move instructions to create directory for data for new dev
 cycle on DTC web server to be done for the rc1 release instead of after the
 official release

---
 docs/Release_Guide/metplus_development.rst    |  1 +
 docs/Release_Guide/metplus_official.rst       |  1 -
 .../metplus/update_web_server_data.rst        | 56 ++++++++++---------
 3 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/docs/Release_Guide/metplus_development.rst b/docs/Release_Guide/metplus_development.rst
index ecd25965c7..fd8cc4aa98 100644
--- a/docs/Release_Guide/metplus_development.rst
+++ b/docs/Release_Guide/metplus_development.rst
@@ -21,4 +21,5 @@ Create a new vX.Y.Z-betaN or vX.Y.Z-rcN development release from the develop bra
 .. include:: release_steps/metplus/update_version_on_develop.rst
 .. include:: release_steps/metplus/update_dtc_website.rst
 .. include:: release_steps/finalize_release_on_github_development.rst
+.. include:: release_steps/metplus/update_web_server_data.rst
 .. include:: release_steps/release_acceptance_testing.rst
diff --git a/docs/Release_Guide/metplus_official.rst b/docs/Release_Guide/metplus_official.rst
index ad83b2f6b8..c09ce003c9 100644
--- a/docs/Release_Guide/metplus_official.rst
+++ b/docs/Release_Guide/metplus_official.rst
@@ -24,5 +24,4 @@ Create a new vX.Y.Z official release from the develop branch.
 .. include:: release_steps/update_docs_official.rst
 .. include:: release_steps/metplus/add_next_version_to_lookup.rst
 .. include:: release_steps/metplus/coordinated_release_announcement.rst
-.. include:: release_steps/metplus/update_web_server_data.rst
 .. include:: release_steps/set_beta_deletion_reminder_official.rst
diff --git a/docs/Release_Guide/release_steps/metplus/update_web_server_data.rst b/docs/Release_Guide/release_steps/metplus/update_web_server_data.rst
index 8f7d664bf4..aaf4d59bac 100644
--- a/docs/Release_Guide/release_steps/metplus/update_web_server_data.rst
+++ b/docs/Release_Guide/release_steps/metplus/update_web_server_data.rst
@@ -4,37 +4,43 @@ Update DTC Web Server Data
 Create Directory for Next Release
 """""""""""""""""""""""""""""""""
 
-On the DTC web server where the sample input data for use cases is hosted,
-run the setup_next_release_data.py script for the next upcoming release
-to set up the data directory for the next major/minor version development.
-The script can be found in the METplus repository in internal/tests/use_cases.
-The file should be found in the home directory of the met_test user on
-the DTC web server host. It is linked to the file in the METplus repository.
-Pull the latest changes from the develop branch before running the script::
+.. dropdown:: If creating a rc1 release
 
-    runas met_test
-    cd /home/met_test/METplus
-    git checkout develop
-    git pull
+  On the DTC web server where the sample input data for use cases is hosted,
+  run the setup_next_release_data.py script for the next upcoming release
+  to set up the data directory for the next major/minor version development.
+  The script can be found in the METplus repository in internal/tests/use_cases.
+  The file should be found in the home directory of the met_test user on
+  the DTC web server host. It is linked to the file in the METplus repository.
+  Pull the latest changes from the develop branch before running the script::
 
-Now run the script passing in the version of the next release, i.e.
-if creating the v4.1.0 release, pass in v5.0 as the argument::
+      runas met_test
+      cd /home/met_test/METplus
+      git checkout develop
+      git pull
 
-    new_version=v5.0
-    /home/met_test/setup_next_release_data.py ${new_version}
+  Now run the script passing in the version of the next release, i.e.
+  if creating the v6.0.0-rc1 release, pass in v6.1 as the argument::
 
-See the comments in the script for more details.
-Ensure that the script runs without error and that the newly created
-directory contains links to all of the sample data tar files::
+      new_version=v6.1
+      /home/met_test/setup_next_release_data.py ${new_version}
 
-    ls -lh /home/met_test/METplus_Data/${new_version}
+  See the comments in the script for more details.
+  Ensure that the script runs without error and that the newly created
+  directory contains links to all of the sample data tar files::
 
-Untar each of the sample data tarfiles so the model_applications and
-met_test directories exist::
+      ls -lh /home/met_test/METplus_Data/${new_version}
 
-    cd /home/met_test/METplus_Data/${new_version}
-    for f in sample_data*; do echo tar xzf $f;tar xzf $f; done
+  Untar each of the sample data tarfiles so the model_applications and
+  met_test directories exist::
 
-Check if the met_test and model_applications directories now exist::
+      cd /home/met_test/METplus_Data/${new_version}
+      for f in sample_data*; do echo tar xzf $f;tar xzf $f; done
 
-    ls -lh /home/met_test/METplus_Data/${new_version}
+  Check if the met_test and model_applications directories now exist::
+
+      ls -lh /home/met_test/METplus_Data/${new_version}
+
+.. dropdown:: If creating a betaN or rc2+ release
+
+  Continue to the next instruction.