Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 1553 weather regime #1577

Closed
wants to merge 15 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/jobs/docker_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,17 @@ MET_TAG=`${GITHUB_WORKSPACE}/scripts/docker/hooks/get_met_version`
MET_DOCKER_REPO=met-dev
if [ "${MET_TAG}" != "develop" ]; then
MET_DOCKER_REPO=met
elif [ "${EXTERNAL_TRIGGER}" == "true" ]; then
# if MET tag is develop and external repo triggered workflow
# then append -lite to MET tag name to use tag generated by
# MET GHA workflow that does not include MET unit test tools
MET_TAG=${MET_TAG}-lite
fi

# if MET_FORCE_TAG variable is set and not empty, use that version instead
if [ ! -z "$MET_FORCE_TAG" ]; then
MET_TAG=$MET_FORCE_TAG
MET_DOCKER_REPO=met
fi

echo Using MET_DOCKER_REPO=$MET_DOCKER_REPO
Expand Down
2 changes: 1 addition & 1 deletion .github/jobs/get_use_cases_to_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ run_all_use_cases=$2
run_unit_tests=$3

echo Run use cases: $run_use_cases
echo Run All use cases: $run_all_use_cases
echo Run all use cases: $run_all_use_cases
echo Run unit tests: $run_unit_tests

# if running use cases, generate JQ filter to use
Expand Down
8 changes: 8 additions & 0 deletions .github/jobs/set_job_controls.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,11 @@ echo ::set-output name=branch_name::$branch_name

# get use cases to run
.github/jobs/get_use_cases_to_run.sh $run_use_cases $run_all_use_cases $run_unit_tests

# echo output variables to review in logs
echo branch_name: $branch_name
echo run_diff: $run_diff
echo run_save_truth_data: $run_save_truth_data
echo external_trigger: $external_trigger
echo run_get_image: $run_get_image
echo run_get_input_data: $run_get_input_data
4 changes: 2 additions & 2 deletions .github/parm/use_case_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
},
{
"category": "marine_and_cryosphere",
"index_list": "3-4",
"index_list": "3-5",
"run": false
},
{
"category": "marine_and_cryosphere",
"index_list": "5",
"index_list": "6",
"run": false
},
{
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ jobs:
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
EXTERNAL_TRIGGER: ${{ needs.job_control.outputs.external_trigger }}
#MET_FORCE_TAG: 10.0.0

update_data_volumes:
Expand Down
1 change: 1 addition & 0 deletions docs/Release_Guide/met_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/update_release_notes_official.rst
.. include:: release_steps/rotate_authorship.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/met/create_release_reference_branch.rst
.. include:: release_steps/create_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/create_release_extra.rst
Expand Down
1 change: 0 additions & 1 deletion docs/Release_Guide/metplus_official.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ Create a new vX.Y.Z official release from the develop branch.
.. include:: release_steps/metplus/update_manage_externals.rst
.. include:: release_steps/merge_release_issue.rst
.. include:: release_steps/metplus/create_release_reference_branch.rst
.. include:: release_steps/metplus/update_release_content.rst
.. include:: release_steps/push_release_branch.rst
.. include:: release_steps/create_release_on_github.rst
.. include:: release_steps/metplus/create_release_extra.rst
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Create Release on GitHub
https://|projectRepo|.readthedocs.io/en/vX.Y.Z-betaN/Users_Guide/release-notes.html
(Note: the URL will not be active until the release is created)

* Add a link to the PDF of the |projectRepo| User's Guide, if available.
The PDF can be downloaded from ReadTheDocs if it is available, i.e.
* Add links to the HTML and PDF versions of the |projectRepo| User's Guide on ReadTheDocs.
https://|projectRepo|.readthedocs.io/_/downloads/en/vX.Y.Z-betaN/pdf/
(Note: the URL will not be active until the release is created)
Original file line number Diff line number Diff line change
@@ -1,19 +1,37 @@
Finalize Release on GitHub
--------------------------

* Close the GitHub issue for creating this official release.
* Edit the milestone for the current release by updating the *Due date* with the actual release date.
* If necessary, create a new milestone for the next official release (e.g. next vX.Y.Z release).
* If necessary, reassign any remaining issues for the current milestone to the next one.
* Close the current milestone.
* Confirm that all existing development projects for the current milestone are closed.
* If necessary, create development projects for the next milestone (e.g. |projectRepo|-X.Y.Z-beta1, beta2, beta3).
* Update the repository settings by resetting the *Default branch* to the new main_vX.Y branch:
* Update milestones:

* Edit the milestone for the current release by updating the *Due date* with the actual release date.

* Close the current milestone.

* Create a new milestone for the first bugfix release (e.g. first vX.Y.1 (bugfix) release).

* If necessary, create a new milestone for the next official release (e.g. next vX.Y.Z release).

* Update issues:

* Close the GitHub issue for creating this official release.

* If necessary, reassign any remaining issues for the current milestone to other milestones.

* Update projects:

* Confirm that all existing development projects for the current milestone are closed.

* If necessary, create development projects for the next milestone (e.g. |projectRepo|-X.Y.Z-beta1, beta2, beta3).

* Update branches:

* Remove any remaining stale development branches from the new release.

* Update the repository settings by resetting the *Default branch* to the new main_vX.Y branch:

.. parsed-literal::

https://github.com/dtcenter/|projectRepo|
-> Settings
-> Branches (tab on left)
-> change the drop down to new branch

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Create Release Reference Branch
-------------------------------

* Create a branch from the develop branch for the reference branch for the
new official release and push it to GitHub. The branch name should match
the format main_vX.Y-ref where X.Y is the major/minor release number.

.. parsed-literal::

cd |projectRepo|
git checkout develop
git pull
git checkout -b main_vX.Y-ref

Push Reference Branch to GitHub
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

::

git push -u origin main_vX.Y-ref

Pushing this branch to GitHub should trigger the GitHub Actions automation
that runs all of the use cases and creates Docker data volumes with the output
data. These data will be used to verify that any bugfixes applied to the
main_vX.Y branch does not break any of existing logic.

Monitor GitHub Actions Workflow
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Navigate to https://github.com/dtcenter/MET/actions and verify that a
*Testing* workflow was triggered on the *main_vX.Y-ref* branch.

* Wait until the entire workflow has run successfully. The final job entitled
"Create Output Docker Data Volumes" should create Docker data volumes for
each use case category on DockerHub (dtcenter/met-dev).
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,41 @@ Create Release Reference Branch
git checkout develop
git pull
git checkout -b main_vX.Y-ref

Update the version number
^^^^^^^^^^^^^^^^^^^^^^^^^

Update the content that should go into the release version but remain unchanged
in the develop branch.

Remove **-dev** from the version number:

* As of METplus 4.0.0, we are naming releases with X.Y.Z format even if Z is 0.
* As of METplus v4.0.0, the file containing the version number is located at
**metplus/VERSION** (in earlier releases, the file was located at
docs/version or doc/version).
* In the develop branch, the version should match the upcoming release
with -dev added to the end like X.Y.Z-betaN-dev, i.e. 4.0.0-beta1-dev
* Remove **-dev** from the version number so that it matches the release
you are creating.

Commit these changes.

Push Reference Branch to GitHub
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

::

git push -u origin main_vX.Y-ref

Pushing this branch to GitHub should trigger the GitHub Actions automation
that runs all of the use cases and creates Docker data volumes with the output
data. These data will be used to verify that any bugfixes applied to the
main_vX.Y branch does not break any of existing logic.

Monitor GitHub Actions Workflow
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Navigate to https://github.com/dtcenter/METplus/actions and verify that a
*Testing* workflow was triggered on the *main_vX.Y-ref* branch.

Expand All @@ -35,6 +63,9 @@ Navigate to https://github.com/dtcenter/METplus/actions and verify that a
each use case category on DockerHub (dtcenter/metplus-data-dev). The names
of these volumes start with *output-*.

Create main branch and push to GitHub
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

* After the truth data volumes have been generated, create the main_vX.Y
branch off of the -ref branch.

Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion docs/Release_Guide/release_steps/open_release_issue.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Open Release Issue

* "Create the |projectRepo| vX.Y.Z-betaN (or -rcN) release" for a development release.

* For an official or development release, assign the issue to the current |projectRepo| development project.
* For an official or development release, assign the issue to the corresponding |projectRepo| development project.

* For a bugfix release, assign the issue to the organization level support project.

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading