Skip to content

Merge release/1.9.0 into develop#1572

Merged
climbfuji merged 54 commits intoJCSDA:developfrom
climbfuji:feature/merge_rel190_into_develop
Mar 21, 2025
Merged

Merge release/1.9.0 into develop#1572
climbfuji merged 54 commits intoJCSDA:developfrom
climbfuji:feature/merge_rel190_into_develop

Conversation

@climbfuji
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji commented Mar 20, 2025 •
edited
Loading

Summary

Merge branch release/1.9.0 into develop. I had to resolve conflicts for the following files, please double check:

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   configs/containers/docker-ubuntu-gcc-openmpi.yaml
        both modified:   configs/sites/tier1/acorn/packages_intel.yaml
        both modified:   doc/source/NewSiteConfigs.rst
        both modified:   doc/source/conf.py
        both modified:   util/nrl/batch_install.sh

Testing

  • CI
  • Installation and testing of release code on all systems (except Gaea C5/C6)
  • Continuous testing of develop code

Applications affected

Potentially all

Systems affected

Potentially all

Dependencies

Issue(s) addressed

Closes #1485

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.

AlexanderRichert-NOAA and others added 30 commits January 16, 2025 21:36
@AlexanderRichert-NOAA
add wcoss2 site config
df2bdc1
@AlexanderRichert-NOAA
update nco template
3df26e7
@AlexanderRichert-NOAA
update wcoss2 packages.yaml
6ea49f5
@AlexanderRichert-NOAA
update wcoss2 packages.yaml
8be7537
@AlexanderRichert-NOAA
Update wcoss2 modules.yaml (core_compilers, hierarchy)
3945113
@AlexanderRichert-NOAA
Update packages.yaml
183679f
@AlexanderRichert-NOAA
Update packages.yaml
72a9245
@AlexanderRichert-NOAA
suffix for gcc-built boost
5992bda
@AlexanderRichert-NOAA
two boosts
e3ff2fd
@AlexanderRichert-NOAA
Update wcoss2 packages.yaml (boost)
e2af5bc
@AlexanderRichert-NOAA
Merge branch 'develop' into wcoss2_jan25
a906501
@AlexanderRichert-NOAA
wcoss2: re-allow metamodule usage
c44db31
@AlexanderRichert-NOAA
virt->virtual
4ff943b
@AlexanderRichert-NOAA
Merge branch 'release/1.9.0' into wcoss2_jan25
91f20a0
@AlexanderRichert-NOAA
update acorn site config
393ec8d
@RatkoVasic-NOAA
Update Orion yaml files (JCSDA#1501)
e0b56c9
@AlexanderRichert-NOAA
Merge branch 'release/1.9.0' into acorn-1.9.0
d0595b5
@AlexanderRichert-NOAA
Merge pull request JCSDA#1499 from AlexanderRichert-NOAA/acorn-1.9.0
21a289a 
1.9.0: update acorn site config
@AlexanderRichert-NOAA
Merge branch 'release/1.9.0' into wcoss2_jan25
3ac7263
@AlexanderRichert-NOAA
Merge pull request JCSDA#1458 from AlexanderRichert-NOAA/wcoss2_jan25
6787800 
release/1.9.0: Add WCOSS2 site config
@InnocentSouopgui-NOAA
release/1.9.0: Update s4 to use intel oneapi 2024 (JCSDA#1475)
cd3b472
@climbfuji
Update .github/workflows/ubuntu-ci-x86_64-gnu.yaml from develop (cann…
2ebe81a 
…ot cherry-pick 58ab975) (JCSDA#1513)
@RatkoVasic-NOAA
Update Hera files for spack-stack-1.9.0 (JCSDA#1507)
a468143 
* Update Hera files for spack-stack-1.9.0
* Install cdo version 2.3.0
* Removed QT from using system installed version on Orion
@rickgrubin-noaa
hercules site config for release/1.9.0 (JCSDA#1506)
2887da0 
Update / add required config files for tier1 site hercules
@rickgrubin-noaa
Add host ursa to tier1 sites (JCSDA#1504)
99af8f1
@ashley314
discover oneapi configs (JCSDA#1517)
ca6d6fe
@AlexanderRichert-NOAA
wcoss2: remove redundant fckit 'require'
df86c5e
@AlexanderRichert-NOAA
Merge pull request JCSDA#1518 from JCSDA/AlexanderRichert-NOAA-patch-1
0cf4ba0 
wcoss2: remove redundant fckit 'require'
@eap
copy docker-ubuntu-gcc to make gcc11 container
ec40929
@eap
change compiler to gcc 11
af0618d
eap and others added 8 commits March 6, 2025 22:36
@eap
Merge pull request JCSDA#1546 from eap/feature/191-env-patch
9f4b2d3 
This change adds external intel-oneapi-runtime to container and Ubuntu site config. This has been tested on the container ubuntu AWS system.

Systems affected:
- CI and developer machines.

I am bypassing the failed test since the test was interrupted externally and it was the MacOS CI.
@climbfuji
Update utl/nrl/batch_install.sh: allow duplicates for crtm-fix and ma…
017d256 
…pl (JCSDA#1549)

We need to allow duplicate versions of `mapl` and `crtm-fix` in the NRL batch install script due to the recent (and somewhat less recent) changes in release/1.9.0.
@climbfuji
release/1.9 branch: Readthedocs config: 1.9.0-> 1.9.1 (JCSDA#1552)
104a083
@rickgrubin-noaa
Fix incorrect site configs, revert zlib-ng to zlib, update Pre-config…
ba656ce 
…ured Sites (JCSDA#1558)

Fix incorrect module file syntax (hercules, orion, ursa)
Revert zlib-ng (ursa)
Update Pre-configured Sites (hercules, jet, orion, ursa)
@InnocentSouopgui-NOAA
Split package to support intel classic and oneapi on S4 (JCSDA#1565)
2aadee8
@climbfuji
Update .gitmodules for spack: release/1.9.0 --> spack-stack-1.9.1 (JC…
6a7e4d2 
…SDA#1567)
@climbfuji
Update .gitmodules and submodule pointer for spack for code review an…
5962c8b 
…d testing
@climbfuji
Merge branch 'release/1.9.0' of https://github.com/jcsda/spack-stack …
fff7866 
…into feature/merge_rel190_into_develop
climbfuji
climbfuji commented Mar 20, 2025
View reviewed changes
@climbfuji climbfuji marked this pull request as ready for review March 20, 2025 12:11
@climbfuji climbfuji self-assigned this Mar 20, 2025
@climbfuji climbfuji mentioned this pull request Mar 20, 2025
Merged
2 tasks
AlexanderRichert-NOAA
AlexanderRichert-NOAA reviewed Mar 20, 2025
View reviewed changes
@climbfuji climbfuji merged commit 7ab4389 into JCSDA:develop Mar 21, 2025
9 checks passed
@climbfuji climbfuji deleted the feature/merge_rel190_into_develop branch March 21, 2025 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlexanderRichert-NOAA AlexanderRichert-NOAA AlexanderRichert-NOAA approved these changes

@RatkoVasic-NOAA RatkoVasic-NOAA Awaiting requested review from RatkoVasic-NOAA

@eap eap Awaiting requested review from eap

@fmahebert fmahebert Awaiting requested review from fmahebert

@ashley314 ashley314 Awaiting requested review from ashley314

@InnocentSouopgui-NOAA InnocentSouopgui-NOAA Awaiting requested review from InnocentSouopgui-NOAA

@rickgrubin-noaa rickgrubin-noaa Awaiting requested review from rickgrubin-noaa

Assignees

@climbfuji climbfuji

Labels

None yet

Projects

No open projects
spack-stack-1.9.x (2024 Q4 - 2025 Q3)
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

spack-stack-1.9.0 --> 1.9.1 release tasks

9 participants

@climbfuji @AlexanderRichert-NOAA @RatkoVasic-NOAA @InnocentSouopgui-NOAA @rickgrubin-noaa @ashley314 @eap @stiggy87 @fmahebert