Skip to content

Merge release/2.1 into develop#1961

Draft
climbfuji wants to merge 17 commits intoJCSDA:developfrom
climbfuji:feature/merge_rel21_into_develop
Draft

Merge release/2.1 into develop#1961
climbfuji wants to merge 17 commits intoJCSDA:developfrom
climbfuji:feature/merge_rel21_into_develop

Conversation

@climbfuji
Copy link
Collaborator

Description

All in the title.

@ashley314 This merge contains the update to the Discover site config that forces the variant +ecflow for ewok-env. We need to decide what to do. I am not sure we want to enable this across the board. System that JCSDA doesn't work with (most NOAA and NAVY systems, for example) don't need to support ewok, especially not with the ecflow GUI. Is JCSDA's strategy to switch from ecflow to cylc entirely in the near future?

Dependencies

Issues addressed

Working toward #1884

Applications affected

None (only site config updates)

Systems affected

Most (see site config updates)

Testing

  • CI: Note whether the automatic tests (GitHub actions tests that run automatically for every commit) pass or not
    • GitHub actions CI tests pass
    • GitHub actions CI tests do not pass (provide explanation)
    • GitHub actions CI tests skipped (provide explanation if necessary)
  • New tests added: List and describe any new tests added to GitHub actions
    • ...
  • Additional testing: Add information on any additional tests conducted
    • ...

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.
  • All necessary updates to the documentation (spack-stack wiki) will be made when this PR is merged

climbfuji and others added 16 commits February 23, 2026 12:58
* [skip ci] add oneapi@2025.3.1 compilers and oneapi@2021.17 MPI
* [skip ci] add packages_gcc for completeness
…gs for release 2.1 (JCSDA#1947)

Update zlib on derecho to v1.2.13. The system-supplied libz libraries are used.

Add compiler package configs for gaea-c6. Environments successfully build in personal test location.
Configuration of release/2.1 for building the ue-oneapi-2025.3.0 and ue-gcc-12.4.0 environments on NOAA-AWS Rocky9 cluster.
Site config updates for the current JCSDA maintained ec2 AMIs

Note: Because my toolchain changes would also break other site configs in this release, I have removed toolchains from this PR.

Testing
Locally tested
* Update discover gcc configs
* update discover ewok-env to include ecflow
This is a batch of changes to the container environment in 2.1. Additionally this includes an update to the aws-ec2 environment which allows both numpy and aws tools to coexist with the older python setuptools.

### Systems affected

CI, containers, ec2.

## Testing

Local builds and testing.
* Update .gitmodules: use tags spack-stack-2.1.0

* Update submodule pointer for repos/builtin
…system (JCSDA#1956)

Tier1 noaa-azure and noaa-aws:
Configuration of release/2.1 for building the ue-oneapi-2025.3.0 and ue-gcc-12.4.0 environments on NOAA-AWS Rocky9 cluster
I did a clean site config build from a fresh clone and found the following issues with aws-ubuntu2404. With these changes the stack builds cleanly in both gcc and oneapi.

Issues:

JCSDA#1957 - Addressed at the site-config level. TBD if we need this in our common config.
JCSDA#1884 - This is built and tested from a clean clone. No further changes for aws-ubuntu2404
@climbfuji climbfuji force-pushed the feature/merge_rel21_into_develop branch from bbcc023 to ee3bbfd Compare March 23, 2026 03:55
@climbfuji climbfuji self-assigned this Mar 23, 2026
@climbfuji climbfuji moved this from Todo to In Progress in spack-stack-2.1.x (2026 Q1) Mar 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: In Progress

Development

Successfully merging this pull request may close these issues.

5 participants