Skip to content

Move S4 and Gaea C5 from tier 1 to tier 2; clean up site config modules.yaml files; bug fix in util/nrl/batch_install.sh #1911

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.

Sign up for GitHub

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

Merged
climbfuji merged 6 commits into from
Feb 12, 2026
Merged

Move S4 and Gaea C5 from tier 1 to tier 2; clean up site config modules.yaml files; bug fix in util/nrl/batch_install.sh #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
559fa76
Update configs/**/modules.yaml: remove unnecessary 'include:python', …
climbfuji Feb 10, 2026
35a5fba
Move gaea-c5 from tier-1 to tier-2
climbfuji Feb 10, 2026
bf5ab3f
Move s4 from tier-1 to tier-2
climbfuji Feb 10, 2026
7efa062
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Feb 11, 2026
82ae60d
Bug fix in util/nrl/batch_install.sh: remove Spack package config cre…
climbfuji Feb 11, 2026
4a38f75
Merge branch 'develop' into feature/module_include_python_cleanup_mov…
climbfuji Feb 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions configs/sites/tier1/acorn/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,5 @@ modules:
enable::
- lmod
lmod:
include:
- python
all:
autoload: run
4 changes: 0 additions & 4 deletions configs/sites/tier1/atlantis/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,5 @@ modules:
enable::
- lmod
lmod:
include:
# List of packages for which we need modules that are blacklisted by default
- python
exclude:
- slurm

3 changes: 0 additions & 3 deletions configs/sites/tier1/aws-pcluster/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/blueback/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/derecho/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/discover-scu17/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/gaea-c6/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/hera/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/hercules/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/narwhal/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
4 changes: 0 additions & 4 deletions configs/sites/tier1/nas/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- python
4 changes: 0 additions & 4 deletions configs/sites/tier1/nautilus/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- python
4 changes: 0 additions & 4 deletions configs/sites/tier1/navy-aws/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
- openmpi
3 changes: 0 additions & 3 deletions configs/sites/tier1/noaa-aws/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/noaa-azure/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier1/noaa-gcloud/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
2 changes: 0 additions & 2 deletions configs/sites/tier1/orion/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,4 @@ modules:
enable::
- lmod
lmod:
include:
- python
- openssl
2 changes: 0 additions & 2 deletions configs/sites/tier1/ursa/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ modules:
lmod:
exclude:
- ecflow
include:
- python
2 changes: 0 additions & 2 deletions configs/sites/tier1/wcoss2/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ modules:
enable::
- lmod
lmod:
include:
- python
hierarchy:
- mpi
- hdf5_virtual
Expand Down
3 changes: 0 additions & 3 deletions configs/sites/tier2/aws-ubuntu2404/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
5 changes: 2 additions & 3 deletions configs/sites/tier2/blackpearl/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ modules:
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
# Compiler
# Compiler modules
- apple-clang
- gcc
- intel-oneapi-compilers
- llvm
# MPI
# MPI modules
- cray-mpich
- intel-mpi
- intel-oneapi-mpi
Expand Down
5 changes: 2 additions & 3 deletions configs/sites/tier2/bounty/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ modules:
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
# Compiler
# Compiler modules
- apple-clang
- gcc
- intel-oneapi-compilers
- llvm
# MPI
# MPI modules
- cray-mpich
- intel-mpi
- intel-oneapi-mpi
Expand Down
2 changes: 0 additions & 2 deletions configs/sites/tier2/casper/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ modules:
lmod:
exclude:
- ecflow
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier2/cole/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
13 changes: 11 additions & 2 deletions configs/sites/tier2/emc-rhel/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ modules:
- lmod
lmod:
include:
# List of packages for which we need modules that are blacklisted by default
- openmpi
# Compiler modules
- apple-clang
- gcc
- intel-oneapi-compilers
- llvm
# MPI modules
- cray-mpich
- intel-mpi
- intel-oneapi-mpi
- mpich
- mpt
- openmpi
4 changes: 0 additions & 4 deletions configs/sites/tier2/endeavor/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- python
0 configs/sites/tier1/gaea-c5/compilers.yaml → configs/sites/tier2/gaea-c5/compilers.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/gaea-c5/config.yaml → configs/sites/tier2/gaea-c5/config.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/gaea-c5/mirrors.yaml → configs/sites/tier2/gaea-c5/mirrors.yaml
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions configs/sites/tier1/gaea-c5/modules.yaml → configs/sites/tier2/gaea-c5/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
0 configs/sites/tier1/gaea-c5/packages.yaml → configs/sites/tier2/gaea-c5/packages.yaml
View file
Open in desktop
File renamed without changes.
0 ...s/sites/tier1/gaea-c5/packages_intel.yaml → ...s/sites/tier2/gaea-c5/packages_intel.yaml
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions configs/sites/tier2/jean/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- python
3 changes: 0 additions & 3 deletions configs/sites/tier2/jet/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- lmod
lmod:
include:
- python
1 change: 0 additions & 1 deletion configs/sites/tier2/linux.default/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ modules:
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default# By default, do not create compiler modules
# Compiler modules
- apple-clang
- gcc
Expand Down
1 change: 0 additions & 1 deletion configs/sites/tier2/macos.default/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ modules:
- lmod
lmod:
include:
# List of packages for which we need modules that are blacklisted by default# By default, do not create compiler modules
# Compiler modules
- apple-clang
- gcc
Expand Down
0 configs/sites/tier1/s4/compilers.yaml → configs/sites/tier2/s4/compilers.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/s4/config.yaml → configs/sites/tier2/s4/config.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/s4/mirrors.yaml → configs/sites/tier2/s4/mirrors.yaml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion configs/sites/tier1/s4/modules.yaml → configs/sites/tier2/s4/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ modules:
lmod:
include:
- mpich
- python
0 configs/sites/tier1/s4/packages.yaml → configs/sites/tier2/s4/packages.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/s4/packages_intel.yaml → configs/sites/tier2/s4/packages_intel.yaml
View file
Open in desktop
File renamed without changes.
0 configs/sites/tier1/s4/packages_oneapi.yaml → configs/sites/tier2/s4/packages_oneapi.yaml
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions configs/sites/tier2/tusk/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
3 changes: 0 additions & 3 deletions configs/sites/tier2/ubuntu2404-nvhpc/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
- python
4 changes: 0 additions & 4 deletions configs/sites/tier2/wheat/modules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ modules:
default:
enable::
- tcl
tcl:
include:
# List of packages for which we need modules that are blacklisted by default
- python
4 changes: 4 additions & 0 deletions util/nrl/batch_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,10 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
# Fix permissions for the bootstrap mirror
fix_permissions ${host} ${bootstrap_mirror_path} 0
update_bootstrap_mirror="false"
# When spack creates a bootstrap mirror, it populates the "spack" scope
# with compilers and packages it finds, which can create problems later
echo "Removing package config in spack/etc/spack created by spack boostrap mirror"
rm -vf spack/etc/spack/packages.yaml
fi

if [[ ! ${env_exists} == "true" ]]; then
Expand Down