Revert changes that were only needed on the release/1.6.0 branch

JCSDA · Jan 14, 2024 · d4eedac · d4eedac
1 parent a9ab1aa
commit d4eedac
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: