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

Replace manage_externals with git-fleximod #276

Merged
merged 15 commits into from
Jul 17, 2024

Conversation

nusbaume
Copy link
Collaborator

@nusbaume nusbaume commented Jul 10, 2024

Originator(s): nusbaume
Date: July 7th, 2024
One-line Summary: Replace manage_externals with git-fleximod

Purpose of changes:

This PR removes the manage_externals tool and replaces it with the new git-fleximod system, which is what will be used in CAM7 and CESM3. This PR also introduces an SE-CSLAM dycore build test to the CAM-SIMA regression test list.

Issues closed (include Github closing keyword and issue number):

Closes #266
Closes #275

Describe any changes made to build system:

Externals are now brought in via bin/git-fleximod update instead of manage_externals/checkout_externals.

Describe any changes made to the namelist: None

List any changes to the defaults for the boundary datasets: None

Describe any substantial timing or memory changes: None

Code reviewed by: cacraigucar, peverwhee

List all files eliminated:

D Externals.cfg
D Externals_CAM.cfg
D manage_externals/*

  • Remove manage_externals tool and associated files

List all files added and what they do:

A .gitmodules
A bin/git-fleximod
A .lib/git-fleximod/*
A external git submodules

  • Add git-fleximod tool and associated files and submodules.

A cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/shell_commands
A cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_se_cslam_derecho_nooutput/user_nl_cam

  • Add new SE-CSLAM dycore build test to regression test list.

List all existing files that have been modified, and describe the changes:

M .github/workflows/python_unit_tests.yml

  • Use git-fleximod instead of manage_externals in testing workflow.

M .github/scripts/pr_mod_file_tests.py

  • Ignore git-fleximod files when performing static analysis.

M .gitignore

  • Update .gitignore to properly work with git submodules

M cime_config/cam_autogen.py

  • Fix failing doctest

M cime_config/testdefs/testlist_cam.xml

  • Add SE-CSLAM build test to regression test list.

Test results:

derecho/intel: All tests passed.

derehco/gnu: All tests passed, including snapshot tests for Kessler and Held-Suarez

git-subtree-dir: .lib/git-fleximod
git-subtree-split: c624b61124d911f52ca8eead618ed2dd3c1b2171
a6e43fc Bump to 0.8.1
229ba03 Merge pull request ESCOMP#53 from ESMCI/fix/ssh_access
e9cd2be better fix for issue with ssh access

git-subtree-dir: .lib/git-fleximod
git-subtree-split: a6e43fcfd70795763c0fed13d3b0d8ae9151dcc7
75a0337 Bump to 0.8.2
7136066 Merge pull request ESCOMP#54 from ESMCI/fix/tag-not-found
a90de4f update to fetch tag first

git-subtree-dir: .lib/git-fleximod
git-subtree-split: 75a03373577f5ed19a00d2c387ca36bff1172d76
@nusbaume nusbaume added enhancement New feature or request externals externals updating issue or PR testing system Related to SIMA testing and/or test scripts labels Jul 10, 2024
@nusbaume nusbaume self-assigned this Jul 10, 2024
Copy link
Collaborator

@peverwhee peverwhee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me! thanks @nusbaume

Copy link
Collaborator

@cacraigucar cacraigucar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving with the caveat that my testing was limited (I was able to successfully checkout the externals using git-fleximod). There were file differences when compared with the current CAM-SIMA, but I expect that has nothing to do with this PR.

@nusbaume nusbaume merged commit 4609b76 into ESCOMP:development Jul 17, 2024
6 checks passed
@nusbaume nusbaume deleted the git-fleximod branch July 27, 2024 19:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request externals externals updating issue or PR testing system Related to SIMA testing and/or test scripts
Projects
Status: Tag
Development

Successfully merging this pull request may close these issues.

3 participants