Skip to content

release/1.7.0: revert uppercase PACKAGE_ROOT env vars#1068

Merged
AlexanderRichert-NOAA merged 1 commit intoJCSDA:release/1.7.0from
climbfuji:feature/revert_uppercase_root
Apr 10, 2024
Merged

release/1.7.0: revert uppercase PACKAGE_ROOT env vars#1068
AlexanderRichert-NOAA merged 1 commit intoJCSDA:release/1.7.0from
climbfuji:feature/revert_uppercase_root

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Apr 10, 2024

Summary

Update submodule pointer for the changes described in JCSDA/spack#421 and remove the previously added jedi_cmake_ROOT env vars in configs/common/modules_*.yaml.

This is for the release branch. After this is merged, we will need to retag the spack submodule, update spack-stack (remove the extra JEDI_CMAKE_ROOT env settings in configs/common/modules.*yaml), tag, go back to all supported platforms, check out the final tagged code, and rerun the spack module ??? refresh && spack stack setup-meta-modules commands.

List of platforms:

Testing

  • CI

Applications affected

All = none (because our applications still expect the lowercase/case-preserving version)

Systems affected

All

Dependencies

Issue(s) addressed

Resolves #1066

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.

@climbfuji climbfuji self-assigned this Apr 10, 2024
@climbfuji climbfuji added INFRA JEDI Infrastructure NOAA-EMC OAR-EPIC NOAA Oceanic and Atmospheric Research and Earth Prediction Innovation Center labels Apr 10, 2024
@AlexanderRichert-NOAA
Copy link
Copy Markdown
Collaborator

It sounds like it should work to run git submodule update --remote spack then rebuild the modules?

@climbfuji
Copy link
Copy Markdown
Collaborator Author

It sounds like it should work to run git submodule update --remote spack then rebuild the modules?

Please try, yes.

I'll do the following after this is merged and spack-stack tagged (so that I know for sure I have the final tag on the system):

git remote update
git checkout origin/1.7.0
git submodule update spack
# do the things needed to activate the environment
spack module [tcl|lmod] refresh
spack-stack setup-meta-modules # strictly speaking only needed for tcl, but doesn't hurt

@climbfuji
Copy link
Copy Markdown
Collaborator Author

@AlexanderRichert-NOAA I think we can merge this first, then tag and complete the list above. I tested it on my macOS and it works as expected.

@AlexanderRichert-NOAA AlexanderRichert-NOAA merged commit 47343de into JCSDA:release/1.7.0 Apr 10, 2024
@climbfuji climbfuji deleted the feature/revert_uppercase_root branch April 10, 2024 17:27
@natalie-perlin
Copy link
Copy Markdown
Collaborator

natalie-perlin commented Apr 10, 2024

@climbfuji -
Does the environment ue-intel need to be activated to run these updates?

@natalie-perlin
Copy link
Copy Markdown
Collaborator

... appears to be...
git checkout release/1.7.0

@climbfuji
Copy link
Copy Markdown
Collaborator Author

climbfuji commented Apr 10, 2024

... appears to be... git checkout release/1.7.0

#1068 (comment)

Sorry, not being sufficiently clear - I mean that we run full sequence of commands, except there is no "origin/1.7.0" branch, and it's "release/1.7.0"

@climbfuji
Copy link
Copy Markdown
Collaborator Author

... appears to be... git checkout release/1.7.0

#1068 (comment)

Sorry, not being sufficiently clear - I mean that we run full sequence of commands, except there is no "origin/1.7.0" branch, and it's "release/1.7.0"

git remote update ? that will give you 1.7.0

@climbfuji
Copy link
Copy Markdown
Collaborator Author

I've done my share except Derecho and Casper, which are currently offline due to network issues. I'll check back tonight and complete my assignments

@AlexanderRichert-NOAA
Copy link
Copy Markdown
Collaborator

@natalie-perlin yes, the environment needs to be activated so Spack knows which environment to do the module updates for.

@natalie-perlin
Copy link
Copy Markdown
Collaborator

... done with NOAA Parallel Works CSP

@climbfuji
Copy link
Copy Markdown
Collaborator Author

... done with NOAA Parallel Works CSP

Thank you @natalie-perlin !

@climbfuji
Copy link
Copy Markdown
Collaborator Author

@AlexanderRichert-NOAA Only Acorn missing I think

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

INFRA JEDI Infrastructure NOAA-EMC OAR-EPIC NOAA Oceanic and Atmospheric Research and Earth Prediction Innovation Center

Projects

No open projects

Development

Successfully merging this pull request may close these issues.

3 participants