From d4eedac2d57e01ce379cc6f7a8bad2444ac0186b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 13 Jan 2024 21:00:25 -0700 Subject: [PATCH] Revert changes that were only needed on the release/1.6.0 branch --- .gitmodules | 1 - configs/containers/docker-ubuntu-clang-mpich.yaml | 2 +- configs/containers/docker-ubuntu-gcc-openmpi.yaml | 2 +- configs/containers/docker-ubuntu-intel-impi.yaml | 2 +- configs/sites/aws-pcluster/config.yaml | 6 ------ doc/source/MaintainersSection.rst | 2 +- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3e2cc7000..f4985d2e2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,6 @@ #branch = develop #url = https://github.com/jcsda/spack #branch = jcsda_emc_spack_stack - url = https://github.com/jcsda/spack branch = feature/merge_rel160_into_develop [submodule "doc/CMakeModules"] path = doc/CMakeModules diff --git a/configs/containers/docker-ubuntu-clang-mpich.yaml b/configs/containers/docker-ubuntu-clang-mpich.yaml index 5dd9bb517..fd475d055 100644 --- a/configs/containers/docker-ubuntu-clang-mpich.yaml +++ b/configs/containers/docker-ubuntu-clang-mpich.yaml @@ -115,7 +115,7 @@ spack: os: ubuntu:20.04 spack: url: https://github.com/jcsda/spack - ref: spack-stack-1.6.0 + ref: jcsda_emc_spack_stack resolve_sha: true # Whether or not to strip binaries diff --git a/configs/containers/docker-ubuntu-gcc-openmpi.yaml b/configs/containers/docker-ubuntu-gcc-openmpi.yaml index 15cb87c16..7c2ca47b8 100644 --- a/configs/containers/docker-ubuntu-gcc-openmpi.yaml +++ b/configs/containers/docker-ubuntu-gcc-openmpi.yaml @@ -97,7 +97,7 @@ spack: os: ubuntu:20.04 spack: url: https://github.com/jcsda/spack - ref: spack-stack-1.6.0 + ref: jcsda_emc_spack_stack resolve_sha: true # Whether or not to strip binaries diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml index 5436b6d71..abc283707 100644 --- a/configs/containers/docker-ubuntu-intel-impi.yaml +++ b/configs/containers/docker-ubuntu-intel-impi.yaml @@ -115,7 +115,7 @@ spack: os: ubuntu:20.04 spack: url: https://github.com/jcsda/spack - ref: spack-stack-1.6.0 + ref: jcsda_emc_spack_stack resolve_sha: true # Whether or not to strip binaries diff --git a/configs/sites/aws-pcluster/config.yaml b/configs/sites/aws-pcluster/config.yaml index d9db1b9e1..cf54e6360 100644 --- a/configs/sites/aws-pcluster/config.yaml +++ b/configs/sites/aws-pcluster/config.yaml @@ -7,9 +7,3 @@ config: test_stage: /tmp/spack-stack/cache/test_stage source_cache: /tmp/spack-stack/cache/source_cache misc_cache: /tmp/spack-stack/cache/misc_cache - - # Turn off file locking due to problems with EFS filesystem. - # Do not run parallel "spack install" commands on aws-pcluster! - db_lock_timeout: 60 - package_lock_timeout: 60 - locks: false diff --git a/doc/source/MaintainersSection.rst b/doc/source/MaintainersSection.rst index fd8002748..6cf8a46dc 100644 --- a/doc/source/MaintainersSection.rst +++ b/doc/source/MaintainersSection.rst @@ -669,7 +669,7 @@ mysql Amazon Web Services Parallelcluster Ubuntu 20.04 ------------------------------------------------ -See ``configs/sites/aws-pcluster/README.md``. It is important to note that because the shared EFS filesystem is slow and had problems with the spack locking mechanism introduced mid 2023, all file locking is turned off in the site config. Therefore, one must never run more than one ``spack install`` command for the same environment - that is, no parallel ``spack install`` processes. +See ``configs/sites/aws-pcluster/README.md``. .. _MaintainersSection_Testing_New_Packages: