Skip to content

Commit

Permalink
Update develop-ref after #2488, #2480, and dtcenter/MET#2812 (#2490)
Browse files Browse the repository at this point in the history
* Update release guide to create the input test data directory for official MET releases.

* Follow the METplus naming conventions for updating the the DTC web server data.

* install library needed for geovista package, remove editable flag so geovista code will be added directly to python instead of reading it from the source code location, ci-skip-all

* Feature 685 log updates (#1992)

* add script to create conda environment with MetPy 1.4 for SWPC use case

* Bugfix develop Fix broken documentation links (#2004)

* fixed bug to set environment variables in the RegridDataPlane environment instead of the PyEmbedIngest environment

* Feature #2015 modulefiles (#2024)

* Adding modulefile for WCOSS2

* Updated references of 4.1.1 to 5.0.0

* Feature #2005 updates to create v5.1 conda environments that use debian10 and Python 3.10.4 (#2043)

* update versions to fix bugs for METplotpy/calcpy use cases

* Bugfix #2026 develop StatAnalysis looping (#2028)

* Feature #2022 update python version to 3.10.4 for repo files (#2047)

* Feature #2022 Use Debian 10 / Python 3.10.4 in automated tests (#2050)

* add use case group name to output path so that output and error logs will contain use case category to more easily see which case was run

* remove -group0 from group names for output path

* add manual workflow to update truth data

* ci: set gh token on checkout to enable push, ci-skip-all

* Set user name/email via git config to allow push

* add token to checkout

* Feature #2049 Multiple interp.type.method/width (#2051)

* added missing argument to script if building envs locally

* get main_vX.Y truth data if running on main_vX.Y branch

* Updating README.md for label creation and adding bold to common_labels.txt

* Updated color for bold label

* Feature #2054 consensus.write_members in TCPairs (#2057)

* Create LICENSE.md (#2061)

* per #2006, fix priority of obs_window config variables so that wrapper-specific version is preferred over generic OBS_WINDOW_BEGIN/END (#2062)

* Feature 2065 v5.1.0 beta1 (#2066)

* updated version number

* added release notes

* Update docs/Users_Guide/release-notes.rst

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

---------

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* updated version with -dev

* adding sphinx design to 3 files so dropdown menus will work in the release notes.

* fix version numbers for python requirements for building documentation

* fixed tab vs spaces

* Bugfix #2070 var list numeric order (#2072)

* Adding files for jet and hera

* added commented process list that was accidentally removed -- this is used if the pre-processing steps are needed

* Bugfix #2087 develop docs_pdf (#2091)

* Feature 2076 release dropdown menu (#2083)

* test dropdowns

* Update release-notes.rst

Attempting to resolve WARNING

* testing dropdowns

* adding dropdown menus

* testing dropdown

remove from warning section

* dropdown testing

* dropdown menu tests

* dropdown menus

after the warnings section, the dropdown menu only has one space instead of the normal 2 spaces.  If it has 2 spaces, it gets sucked into the warning section.

* spaces with warning

* no spaces for warning

* Update release-notes.rst

warning note has to be indented 1 space.  Originally it was no spaces but then all of the dropdown menus end up in the warning message.  If it's 2 spaces, as is normal, then the warning is indented, which is unnecessary.  1 space is slightly indented and keeps the dropdown menus separate.

---------

Co-authored-by: jprestop <jpresto@ucar.edu>

* Bugfix #2096/#2098 develop - fix skip if output exists and do not error if no commands were run (#2099)

* Feature 1516 use case mvmode (#2094)

Co-authored-by: Tracy Hertneky <hertneky@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Fix for Dockerfile smell DL4000 (#2112)

Co-authored-by: Giovanni Rosa <giovanni.rosa@unimol.it>

* Changed "PROJECT" to "CYCLE" ASSIGNMENT

* Feature 2115 update use cases (#2133)

* Bugfix #2082 develop regrid.convert/censor_thresh/censor_val (#2140)

fix #2082 main_v5.0 regrid.convert/censor_thresh/censor_val (#2101)

* Bugfix #2137 develop PointStat -obs_valid_beg/end (#2141)

* Feature #2143 5.1.0-beta2 release (#2144)

* update release guide steps with new info based on changes to GitHub web interface

* update version for development towards rc1 release

* Feature #1977 ARGO use case (#2148)

Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>

* Feature develop cycle change (#2150)

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* change PROJECT ASSIGNMENT to CYCLE ASSIGNMENT

* Added paths to ignore

---------

Co-authored-by: jprestop <jpresto@ucar.edu>

* Documentation: Update Truth Data instructions (#2154)

* upgrade python to 3.10 for documentation builds to fix failured introduced by urllib3 (see urllib3/urllib3#2168)

* update workflow to update input test data to use branch from pull down or enter branch by hand if branch does not exist in dtcenter/METplus repo, e.g. if updating data for a PR coming from a fork

* Bugfix #2161 develop PCPCombine additional field arguments in -subtract mode (#2162)

* changed order of workflow event triggering info to more easily see the repository and commit sha that triggered the workflow

* fix docker compose install and call -- needed due to new Alpine Linux release 3.18.0 that does not include docker-compose in the apk repository

* Bugfix #2168 develop - StatAnalysis time shift (#2169)

* Feature 1978 update pyreq doc (#2177)

* Updating for 5.1.0

* Adding greater than or equal to signs

* Feature 2106 release support (#2182)

* Added a paragraph for Release Support Policy

* Added a sentence about contacting the team through the METplus GitHub Discussions Forum.

* Added Release Support Policy info

* Per #2159, modify instructions to reflect that we only want a coordinated release for the official releases and updates to the coordinated release section for the bugfix releases. (#2183)

* Feature 2147 workflow doc (#2185)

* Add new images for github workflow

* Added PR section

* Modified the Find the GitHub Issue to be Find or Create a GitHub issue

* Trying out image keyword compared with figure keyword

* Trying out various widths

* Added new figures

* Reverting to figures from images after modifying figures

* Adding the old images which are better quality

* Trying out new indention

* Working on formatting again

* Reducing image widths

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Update docs/Contributors_Guide/github_workflow.rst

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Update github_workflow.rst

---------

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* added scripts to create new conda environment for PANDA-C use cases

* Bugfix #2189 develop - spaces in complex thresholds (#2191)

* added release notes for completed issues for rc1

* Feature 2011 tci from cesm fluxnet2015 netcdf (#2192)

Co-authored-by: Mrinal Biswas <biswas@seneca.rap.ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Bugfix #2179 develop TCPairs fix -diag argument (#2187)

* sort list of files to make command more readable and make logic more easily testable

* fix unit test to expect alphabetical order of files

* Feature #2197 MODE new multi-variate options (#2203)

* added to release notes

* added release notes for other items completed for rc1 release

* Feature #1626 TCDiag Wrapper (#2201)

* Feature #1610 first round of SonarQube fixes (#2200)

* Feature #2195 create v5.1.0-rc1 release (#2204)

* Update version for development towards official release

* updated script to use metplotpy as base and install pygrib because conda was failing trying to install matplotlib in Docker for some strange reason

* Feature 2188 use case panda c (#2202)

* added first use case, need to finish docs and add to list

* added documentation files, 3 new cases

* added 5th use case, docs

* final use case, corrected paths for output

* Update GridStat_fcstGFS_obsERA5_lowAndTotalCloudFrac.py

* removed chars, added space to last section

* turn off 5/6 new air quality and comp use cases because they are causing the disk to fill up in the automated tests and only 1 is needed to test the new behavior. Reordered use case groups to be alphabetical

* disabled other new air quality use case because the disk is still filling up from this case

* Feature 2136 cross spectra (#2208)

* per #2212, continue instead of return so other forecast leads will not be skipped

* Feature #2210 MODE multi-variate variable rename (#2211)

* Bugfix diff tests (#2217)

* added change from NCEP produtil that was somehow not included in the changes pulled from their repo before starting SonarQube work

* Feature #2228 v5.1.0-rc2 release (#2229)

* update version after rc2 release to note development towards official 5.1.0 release

* Feature #2188 move PANDA-C cases to clouds category and fix automated tests (#2237)

Co-authored-by: j-opatz <jopatz@ucar.edu>

* Feature 2198 use case amdar pbl (#2206)

Co-authored-by: Daniel Adriaansen <dadriaan@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Bugfix #2235 rename multivar_itensity to multivar_intensity_flag (#2236)

* Feature #2230 MvMODE usecase doc updates (#2239)

This updates the use-case documentation to go along with the multivariate MODE enhancements.

* combine release notes from development releases for 5.1.0 release

* fix indentation to prevent incorrect nesting of drop down menus

* Bugfix #2241 Create directory containing -out_stat file (#2242)

* Enhance diff logic to control decimal precision to prevent failures (#2243)

* Bugfix #2245 use unique run ID to name logger instance (#2247)

* per #2245, add METplusConfig class function that is called when object is deleted to close log handlers. This prevents OSError: [Errno 24] Too many open files from running all pytests

* Feature #1626 TCDiag updates to wrapper and basic use case (#2248)

Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>

* move new use case into another group

* Bugfix #2244 develop fix diff tests (#2254)

* skip diff for specific png images that produce diffs occasionally but look the same visually

* add 2 more keywords for use cases that occasionally flag small, unnoticeable diffs in png images

* Feature #2253 update tests for diff_util (#2256)

Co-authored-by: root <root@localhost>

* Feature #1974 Documentation: update coding standards section (#2260)

* Feature #2253 conftest fixture to set pytest tmpdir (#2261)

* Feature #2151 Documentation: Add quick search keywords METplotpy/calcpy use cases (#2259)

* Feature #2138 CI enhance MET Docker tag override (#2258)

* Updating development instructions.

* fixed typo

* fixed another typo

* Feature #2207 Documentation - Updates to Contributor's Guide (#2263)

Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu>

* Feature develop update install files (#2266)

* Updating installation files

* Removing run_commands.sh

* Updated the file to add a MINICONDA_PATH

* Adding files for jet

* Adding orion file

* Removing beta references

* Corrected met version

* Adding files for WCOSS2 machines

* Removing rc1 from acorn file

* Removing beta1

* Bugfix #1853 develop - PointStat don't require mask variables to be set (#2262)

* update version of certifi to match auto-generated dependabot PR #2267

* feature #2253 more tests for diff_util.py (#2264)

* update versions of METplus components for the next official release

* updated release notes for 5.1.0 release

* removed duplicate entries in release notes

* Added EC2 instance recipee with S3 mounting ability (#2269)

* Updating the Subsetting Tests by Marker section (#2272)

* update release date for 5.1.0 release (#2276)

* update version for development towards 6.0.0-beta1 release

* added new use case that was missing

* Bugfix #2279 develop - buoy station file from 2022 (#2280)

* Feature 2253 series analysis tests (#2277)

* Fix typo in pull_request_template.md

* Make code coverage report available (#2287)

* Use updated dtcenter/metplus-action-data-update tag that fixes bug that causes GHA disk to exceed capacity when too many data volumes are created. Use specific commit of coveralls python action to ensure it will not change

* removed climatology keyword from use cases that aren't relevant that were accidentally added with PR #1984

* update readme with current information

* Feature #2282 coord_release_docs (#2288)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* continue workflow if coveralls step fails -- this typically happens on a pull request from a fork because the authentication fails

* Feature 2253 system util tests (#2297)

* Feature #2294 LSR use case (#2295)

* Feature 2253 run util tests (#2307)

* Release Guide - remove beta/rc tags/releases (#2309)

* Add 'component: repository maintenance' label. Already ran the script to push this change and the NOAA OAR reporting label to all the METplus repos.

* Hotfix for labels, adding a new one for 'component: input data' and also fixing the get_lablels.sh to search for up to 200 existing labels. Also work on the log messages.

* Fix typo in comment

* Feature #2283 time looping consolidation (#2311)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* New issue template: Update Truth (#2332)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* feature #2253 tests for run_util, 'Usage' bugfix (#2313)

* Feature #2338 Debian 12 Conda environments (#2341)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* Feature 1488 usecase satwinds (#2324)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Feature #2283 include times (#2345)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* feature #2253 tests for config_validate, mock logger in conftest (#2320)

* Feature #2299 / #2310 Remove deprecated MET config env vars and TCMPRPlotter (#2347)

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>

* remove MODEL and OBTYPE to use defaults from MET config

* Feature #2348 v6.0.0-beta1 release (#2351)

* update version for development towards 6.0.0-beta2 release

* copy libGL and libEGL files into docker image to prevent errors with geovista python package

* run use that uses geovista to test

* Feature #2156 release_acceptance_testing (#2352)

* feature #2253 print error logs from conftest (#2358)

* feature #2253 met_db_load tests (#2355)

* Rename 5.1.0.lua_wcoss2 to 6.0.0.lua_wcoss2

* Update and rename 5.1.0_acorn to 6.0.0_acorn

* Update 6.0.0_acorn

* feature #2253 add tests for gfdl_tracker (#2354)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Create 6.0.0_gaea

* Update and rename 5.1.0_hera to 6.0.0_hera

* Feature #2156 release_acceptance_testing take2 (#2361)

Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>

* Feature #2329 Docker info in Installation Chapter (#2366)

* feature_2253_extract_tiles_tests (#2368)

* Feature 2253 tc pairs tests (#2369)

* Feature 2253 tc csv writer (#2373)

* update requirements for building docs to get around build failure where python packages required to build RTD have disappeared from the automatically generated commands from RTD

* fix ReadTheDocs requirements to include pillow which is a dependency of sphinx-gallery: see https://blog.readthedocs.com/defaulting-latest-build-tools/ for more info on why this was necessary

* Feature #2340 TCDiag one_time_per_file_flag (#2374)

* Update and rename 5.1.0_jet to 6.0.0_jet

* Added libssh

* prune docker files before running use cases to prevent running out of disk space when running use cases, ci-run-all-diff

* Feature 2253 command builder tests (#2378)

* Feature 2253 series analysis test (#2380)

* Feature 2253 py embed test (#2379)

* ignore cyclone plotter from code coverage report because it will be replaced with METplotpy logic

* Feature 898 headers (#2389)

* changing _ to - for header consistency

* changing _ to - for header consistency

* updating all headers for consistency

* updating all headers for consistency and adding spacing

The spacing doesn't seem to be required but it is the convention that we follow for headers.

* updating all headers for consistency

* updating headers for consistency and adding capital letters to  headers

* Using the overline ### to keep index consistent with other indexes

* updating all headers for consistency

* update requirements for building docs to get around build failure where python packages required to build RTD have disappeared from the automatically generated commands from RTD

* updating all headers and some spacing for consistency

* updating headers for consistency

* changing to ### for consistency

* Per #898, fixed the headers for the Release Guide part, chapters, and sections.

* Duplicating changes in develop branch for requirements.txt file

* updating headers

* Per #2669, updated header formatting to resolve errors

* Per #2669, udpating header

* Per #2669, udpating headers

* Per #2669, udpating header

* Per #2669, updated header formatting

* Per #2669, update header formatting

* updating headers

* Per #898, removed space in front of title

* Capitalizing Please

* changing to just italics to match standard formatting

* indenting for consistent formatting

* fixing italics again

* changing from note to warning for consistency

* updating headers, adding some capitalizing to the headers

* fixing typo

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* This file was committed but never updated or used

Per Minna, ok to delete.

* Restructuring table of contents to make it more clear which guides are for users and which are for contributors

* fixing formatting for clairity

Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>

---------

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>

* Feature #2349 upgrade instructions for deprecated MET config files (#2386)

* Feature 2123 di doc update (#2392)

Co-authored-by: Tracy <tracy.hertneky@noaa.gov>

* change log to list name of config variable , e.g. GRID_STAT_CONFIG_FILE, to easily see which variable should be removed

* Feature 1667 doc conventions (#2397)

* New additions based on the old branch feature_1667_updating_overview

* Moving the release-notes reference label

* Added label for METplus_glossary for use in Documentation conentions section.

* Adding images for the Documentation Conventions section

* Modifying wording and testing formatting in Internal Links section

* Second take on formatting

* Third attempt at formatting

* Fourth attempt at formatting

* Modified wording, sections, and formatting

* Minor modifications

* Added period

* Changed Pretty Table to PrettyTable

* Modify informationg about converting an existing table and adding images

* Resolving errors

* Reformatting

* Moving placement of reference label

* Attempting to fix table title

* Fixed incorrect alignment

* Made changes based on Lisa's suggestions

* Made changes based on Lisa's suggestions

* Made corrections

* Made corrections

* Per #1667, fixing typos

* Per #1667, corrected text

---------

Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>

* Feature #2377 Log to terminal only (#2398)

* Update conda envs to use conda-forge only (#2402)

* rearrange MET config env var tables for GridStat so they are in the order that they appear in the wrapped MET config file

* use mamba instead of conda and update version of netcdf python package used to 1.6.2

* skip s2s_mid_lat WeatherRegime use case that produces different results often

* updated version of xesmf because <0.7.1 does not work with mamba

* per #2412, fix bug in GenVxMask to put quotes around argument so a grid specification string with spaces will be an accepted value

* downgrade version of esmf package to fix bug described in pangeo-data/xESMF#246

* Feature #2219 SeriesAnalysis multiple input files (#2408)

* Adding 3 new requestors to the list of common_labels.txt for NOAA/NHC, CSU/CIRA, and Australian BOM ci-skip-all

* Feature 2405 match tables2wrapper (#2416)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* per #2423, follow symbolic links when traversing directories to find files within a time window, ci-run-all-diff

* Feature #2252 WaveletStat wrapper (#2427)

Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>

* add WaveletStat use case to group and temporarily disable TCDiag use case because changes to the wrapper are needed to fix it after changes to the MET tool were merged

* update version number for beta2 release (#2431)

* update version for dev towards beta3

* Feature #2371 Embed use case upgrade demo video into upgrade instructions (#2444)

* fix failing use case tests -- install python packages dateutil and requests via apk instead of pip because the pip commands began failing -- see PEP668 https://peps.python.org/pep-0668/ -- also changed scripts to create conda environments for use case tests to install all packages in a single call to mamba instead of individual calls

* remove commands to install geovista from source because it is now installed from conda

* Feature #1989: Add OMI use case (#2457)

Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>

* Feature #2432 TCDiag new config changes (#2453)

* move medium range 10 use case into group with 3-5 to speed up runs

* Feature #2334 land_mask (and topo_mask) in PointStat (#2456)

* added use cases with pygrib

* Feature #2430 TCPairs consensus.diag_required and consensus.diag_min_req (#2439)

* Quickfix cloud use case desc imgs (#2464)

* added pics, updated desc

* add last two imgs

* Fixing spelling and capitalization

* Feature 2454 doc overview conv (#2471)

* adding documentation in different sections

* adding grid table section

* fixing links

* grammar updates

* Per #2454, updated sections and wording.

* Per #2454, added a period to the end of a sentence.

* Per #2454, fixing formatting

* Per #2454, updating wording

* adding a section for line breaks in a table

* adding :code: information

* trying to fix warning

* take 2

* take 3 or 4

* maybe fixed

* updating link

* fixing web link again

* web link saga continues

* Changed "ReadTheDocs" to "Read the Docs"

* Updated "main_v" references to be "main_v12.0"

* Removed references to main_v*, replacing with raw RST 

It is not maintainable to have links to branches which will become old.  Since we can avoid it by adding the raw RST in the documentation, I have removed all references to main_v* in favor of placing the raw RST in the documentation.

* Modified the "Code in a Paragraph" section

* Reworded for consistency within the document

* Added back the link for Sphinx code blocks

---------

Co-authored-by: Julie Prestopnik <jpresto@ucar.edu>

* add argument to workflow dispatch event so that MET DockerHub repo used for tests can be easily overridden to test changes in a MET PR before merging

* Feature dtcenter/MET#2796 GHA Node20 deprecation warnings (#2473)

* per dtcenter/MET#2796, update versions of actions to prevent deprecated node warnings in GHA runs

* change arguments to workflow dispatch so they are no longer required -- these are not needed to be set when triggering by hand through the web interface

* Feature dtcenter/MET#2796 develop - Fix error log artifact creation (#2475)

* updated version of pillow to fix security vulnerability alerted by dependabot in PR #2477

* remove docker image after runtime image is created from metplus image and conda env image

* turn on use case to test image removal

* prune images if image tag doesn't exist -- it appears that if the image is built on the fly (when PR is coming from fork) then the tag exists, but if not, the image tag is set to <none>

* support commands that must run in the shell to see if || will work in docker image pruning step

* try to fix image removal

* Feature 2383 use case sat alt (#2480)

* new docs, files for use case

* new files

* updating to run use case

* updated python libraries, changed test env

* trying new point logic

* added to script for nan removal

* redid Python script to take adv of new MET ability for nans

* Update run status

* removed unused settings

* run image prune commands separately

* changed shell back to false

* split up use case groups so the same envs are used by a group to see if that resolves the disk space issues

* turn off use cases

* feature 2253 fix empty pytest logs (#2485)

* added more commands to free up disk space as suggested in https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh, ci-run-all-cases

* Feature 2406 redo usecase rrfs (#2488)

* issue #2406 RRFS use case files

* issue #2406 added usecase to tests

* Issue #2406 added metplotpy and metcalcpy as dependencies

---------

Co-authored-by: John Halley Gotway <johnhg@ucar.edu>
Co-authored-by: George McCabe <23407799+georgemccabe@users.noreply.github.com>
Co-authored-by: jprestop <jpresto@ucar.edu>
Co-authored-by: metplus-bot <97135045+metplus-bot@users.noreply.github.com>
Co-authored-by: lisagoodrich <33230218+lisagoodrich@users.noreply.github.com>
Co-authored-by: j-opatz <59586397+j-opatz@users.noreply.github.com>
Co-authored-by: j-opatz <jopatz@ucar.edu>
Co-authored-by: Lisa Goodrich <lisag@ucar.edu>
Co-authored-by: Tracy Hertneky <39317287+hertneky@users.noreply.github.com>
Co-authored-by: Tracy Hertneky <hertneky@seneca.rap.ucar.edu>
Co-authored-by: Giovanni Rosa <g.rosa1@studenti.unimol.it>
Co-authored-by: Giovanni Rosa <giovanni.rosa@unimol.it>
Co-authored-by: Dan Adriaansen <dadriaan@ucar.edu>
Co-authored-by: mrinalbiswas <biswas@ucar.edu>
Co-authored-by: Mrinal Biswas <biswas@seneca.rap.ucar.edu>
Co-authored-by: Christina Kalb <kalb@ucar.edu>
Co-authored-by: jason-english <73247785+jason-english@users.noreply.github.com>
Co-authored-by: Jonathan Vigh <jvigh@ucar.edu>
Co-authored-by: John Sharples <41682323+John-Sharples@users.noreply.github.com>
Co-authored-by: root <root@localhost>
Co-authored-by: Hank Fisher <fisherh@ucar.edu>
Co-authored-by: reza-armuei <144857501+reza-armuei@users.noreply.github.com>
Co-authored-by: Tracy <tracy.hertneky@noaa.gov>
Co-authored-by: Mallory Row <mallory.row@noaa.gov>
Co-authored-by: bikegeek <3753118+bikegeek@users.noreply.github.com>
  • Loading branch information
26 people committed Feb 8, 2024
1 parent 972610f commit b3f2f93
Show file tree
Hide file tree
Showing 46 changed files with 1,916 additions and 112 deletions.
35 changes: 35 additions & 0 deletions .github/jobs/free_disk_space.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,41 @@ sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"

###
# more cleanup taken from https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh
###

echo "=============================================================================="
echo "Freeing up disk space on CI system"
echo "=============================================================================="

echo "Listing 100 largest packages"
dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -n | tail -n 100
df -h
echo "Removing large packages"
sudo apt-get remove -y '^dotnet-.*'
sudo apt-get remove -y '^llvm-.*'
sudo apt-get remove -y 'php.*'
sudo apt-get remove -y '^mongodb-.*'
sudo apt-get remove -y '^mysql-.*'
sudo apt-get remove -y azure-cli google-cloud-sdk hhvm google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
sudo apt-get autoremove -y
sudo apt-get clean
df -h
echo "Removing large directories"

sudo rm -rf /usr/share/dotnet/
sudo rm -rf /usr/local/graalvm/
sudo rm -rf /usr/local/.ghcup/
sudo rm -rf /usr/local/share/powershell
sudo rm -rf /usr/local/share/chromium
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/local/lib/node_modules

###
# end cleanup from azure script
###

printf "\nChecking disk usage after cleanup"

df -h
Expand Down
10 changes: 10 additions & 0 deletions .github/jobs/setup_and_run_use_cases.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,16 @@ def main():
# print list of existing docker images
commands.append('docker images')

# remove docker image after creating run env or prune untagged images
commands.append(f'docker image rm dtcenter/metplus-dev:{branch_name} -f')
commands.append('docker image prune -f')
run_commands(commands)

commands = []

# list docker images again after removal
commands.append('docker images')

# start interactive container in the background
commands.append(
f"docker run -d --rm -it -e GITHUB_WORKSPACE "
Expand Down
10 changes: 10 additions & 0 deletions .github/parm/use_case_groups.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@
"index_list": "9",
"run": false
},
{
"category": "marine_and_cryosphere",
"index_list": "10",
"run": false
},
{
"category": "medium_range",
"index_list": "0",
Expand Down Expand Up @@ -259,6 +264,11 @@
"index_list": "13",
"run": false
},
{
"category": "short_range",
"index_list": "14",
"run": false
},
{
"category": "space_weather",
"index_list": "0-1",
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
name: Documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Install dependencies
Expand All @@ -27,12 +27,12 @@ jobs:
python -m pip install -r docs/requirements.txt
- name: Build Documentation
run: ./.github/jobs/build_documentation.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: METplus_documentation
path: artifact/documentation
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: documentation_warnings.log
Expand Down
70 changes: 49 additions & 21 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,18 @@ on:

workflow_dispatch:
inputs:
force_met_image:
description: 'MET DockerHub repo to force run to use, e.g. met:11.1.0 or met-dev:feature_XYZ_name-PR. Leave this blank to determine repo automatically.'
repository:
description: 'Repository that triggered workflow'
required: true
description: 'Repository that triggered workflow (used by external repo triggering)'
sha:
description: 'Commit hash that triggered the event'
required: true
description: 'Commit hash that triggered the event (used by external repo triggering)'
ref:
description: 'Branch that triggered event'
required: true
description: 'Branch that triggered event (used by external repo triggering)'
actor:
description: 'User that triggered the event'
description: 'User that triggered the event (used by external repo triggering)'
pusher_email:
description: 'Email address of user who triggered push event'
description: 'Email address of user who triggered push event (used by external repo triggering)'

jobs:

Expand All @@ -69,7 +68,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set job controls
id: job_status
run: .github/jobs/set_job_controls.sh
Expand All @@ -93,17 +92,19 @@ jobs:
needs: job_control
if: ${{ needs.job_control.outputs.run_get_image == 'true' && needs.job_control.outputs.run_some_tests == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- name: Free disk space
run: .github/jobs/free_disk_space.sh
- name: Get METplus Image
run: .github/jobs/docker_setup.sh
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
EXTERNAL_TRIGGER: ${{ needs.job_control.outputs.external_trigger }}
#SET_MET_IMAGE: met:11.0.0
SET_MET_IMAGE: ${{ github.event.inputs.force_met_image }}

update_data_volumes:
name: Docker Setup - Update Data Volumes
Expand Down Expand Up @@ -131,8 +132,8 @@ jobs:
needs: [job_control]
if: ${{ needs.job_control.outputs.run_unit_tests == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
Expand Down Expand Up @@ -166,7 +167,7 @@ jobs:
matrix: ${{fromJson(needs.job_control.outputs.matrix)}}
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Free disk space
run: .github/jobs/free_disk_space.sh
Expand Down Expand Up @@ -209,36 +210,63 @@ jobs:
run: .github/jobs/copy_output_to_artifact.sh ${{ steps.get-artifact-name.outputs.artifact_name }}

- name: Upload output data artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && steps.run_tests.conclusion != 'skipped' }}
with:
name: ${{ steps.get-artifact-name.outputs.artifact_name }}
path: artifact/${{ steps.get-artifact-name.outputs.artifact_name }}

- name: Upload error logs artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && steps.save-errors.outputs.upload_error_logs }}
with:
name: error_logs
name: error_logs-${{ steps.get-artifact-name.outputs.artifact_name }}
path: artifact/error_logs
if-no-files-found: ignore

- name: Upload difference data artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ always() && steps.run-diff.outputs.upload_diff == 'true' }}
with:
name: diff-${{ steps.get-artifact-name.outputs.artifact_name }}
path: artifact/diff-${{ steps.get-artifact-name.outputs.artifact_name }}
if-no-files-found: ignore

merge_error_logs:
name: Merge Error Logs
runs-on: ubuntu-latest
needs: use_case_tests
if: ${{ always() && needs.use_case_tests.result == 'failure' }}
steps:
- uses: actions/checkout@v4
- name: Check for error logs
id: check-for-error-logs
run: |
json_data=$(curl -s -H "Authorization: Bearer ${{ github.token }}" \
"https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/jobs")
error_log_jobs=($(echo "$json_data" | jq -r '.jobs[] | select(.name | startswith("Use Case Tests")) | .steps[] | select(.name | startswith("Save error logs")) | select(.conclusion | startswith("success"))'))
# save output variable to merge error logs if any error logs were created
if [ ! -z "${error_log_jobs}" ]; then
echo "has_error_logs=true" >> $GITHUB_OUTPUT
else
echo "has_error_logs=false" >> $GITHUB_OUTPUT
fi
- name: Merge Artifacts
if: ${{ always() && steps.check-for-error-logs.outputs.has_error_logs == 'true' }}
uses: actions/upload-artifact/merge@v4
with:
name: error_logs
pattern: error_logs-*
delete-merged: true

create_output_data_volumes:
name: Create Output Docker Data Volumes
runs-on: ubuntu-latest
needs: [use_case_tests]
if: ${{ needs.job_control.outputs.run_save_truth_data == 'true' }}
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
- run: .github/jobs/create_output_data_volumes.sh
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_truth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
fi
echo ERROR: Branch is $branch_name - must be develop or match main_vX.Y
exit 1
- uses: actions/checkout@v3
- uses: actions/checkout@v4
name: Checkout repository
with:
fetch-depth: 0
Expand Down
Loading

0 comments on commit b3f2f93

Please sign in to comment.