Skip to content

Stack automation / testing enhancements / bug fixes#1603

Merged
climbfuji merged 37 commits intoJCSDA:developfrom
rickgrubin-noaa:automation
Apr 12, 2025
Merged

Stack automation / testing enhancements / bug fixes#1603
climbfuji merged 37 commits intoJCSDA:developfrom
rickgrubin-noaa:automation

Conversation

@rickgrubin-noaa
Copy link
Copy Markdown
Collaborator

Summary

This PR addresses issues that impact end-to-end automated build / test of the stack within CI/CD frameworks like Jenkins (used within EPIC).

Testing

End-to-end run within a Jenkins execution frame on host orion were successful.

Applications affected

n/a

Systems affected

None affected.

Changes allow for removing in-place editing of files to achieve the results that this PR will add.

Dependencies

n/a

These changes will lead to addressing issue #1398 as well as running multiple tests for UFS-WM (rather than the singular control_c48 at the moment)

Issue(s) addressed

Link the issues addressed or resolved by this PR (use Fixes #??? for fully resolved issues)
Fixes #1510
Fixes #1511
Fixes #1512

NOTE: the change to configs/sites/tier1/orion/compilers.yaml and configs/sites/tier1/orion/compilers.yaml are unrelated; they remove unnecessary env settings for compilers.

Checklist

  • This PR addresses one issue/problem/enhancement, or has a very good reason for not doing so.
  • These changes have been tested on the affected systems and applications.
  • All dependency PRs/issues have been resolved and this PR can be merged.

Remove spurious tab
@AlexanderRichert-NOAA
Copy link
Copy Markdown
Collaborator

This looks good- Does this mean that UWM RTs are part of the scheduled runs on Orion?

@rickgrubin-noaa
Copy link
Copy Markdown
Collaborator Author

This looks good- Does this mean that UWM RTs are part of the scheduled runs on Orion?

I've been playing around outside of Jenkins (current lack of allocated hours / have to use the windfall allocation) with how to best (read: most simply) run multiple UWM RTs, and then will integrate that into the orion site-specific script.

@climbfuji
Copy link
Copy Markdown
Collaborator

Not sure why these GitHub action runs failed. This PR doesn't affect them at all

if [ "$TEST_UFSWM" == ON ]; then
. $(dirname $0)/apptests/test_ufswm.sh
if [ "$TEST_UFSWM" == "ON" ]; then
. ${WORK_DIR:-$(dirname $0)}/apptests/test_ufswm.sh
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Should we standardize this variable (i.e. document that this is an option that can be set)?

Since WORK_DIR or WORKDIR is a common name that some HPC centers or users may already use, should we be more generic here and call it something else? Fine to merge as is and fix later when it becomes a problem.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Different question-- Is the idea of the ${WORK_DIR:-$(dirname $0)} logic for if you want to run a copy of test_ufswm.sh that's not the same as the one that lives in the directory of the 06_AppTests.sh being run?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

WORK_DIR (or WORKDIR), as a named variable, can be named to whatever seems most appropriate for the purposes of automation / test; open to suggestions and happy to change it.

The purpose of it is primarily for separate CI/CD tools; in this particular case, for Jenkins (see issue 1512). Per your question, it could also be used in that manner (side effect I hadn't considered).

Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

I am ok with this as is, too

@climbfuji climbfuji merged commit 32cbc66 into JCSDA:develop Apr 12, 2025
9 of 11 checks passed
@rickgrubin-noaa rickgrubin-noaa deleted the automation branch October 2, 2025 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

3 participants