Merge branch 'release/1.7.0' of https://github.com/jcsda/spack-stack …

…into feature/site_config_updates_discover_etc

configs/sites/orion/compilers.yaml

@@ -17,24 +17,6 @@ compilers:
         LD_LIBRARY_PATH: '/apps/gcc-10.2.0/gcc-10.2.0/lib64:/apps/gcc-10.2.0/gcc-10.2.0/contrib/lib'
         CPATH: '/apps/gcc-10.2.0/gcc-10.2.0/include'
     extra_rpaths: []
-- compiler:
-    spec: [email protected]
-    paths:
-      cc: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/icc
-      cxx: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/icpc
-      f77: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/ifort
-      fc: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/ifort
-    flags: {}
-    operating_system: centos7
-    target: x86_64
-    modules:
-    - intel/2018.4
-    environment:
-      prepend_path:
-        PATH: '/apps/gcc-8/gcc-8.3.0/bin'
-        LD_LIBRARY_PATH: '/apps/gcc-8/gcc-8.3.0/lib64:/apps/gcc-8/gcc-8.3.0//lib:/apps/gcc-8/gcc-8.3.0/mpfr-4.0.2/lib:/apps/gcc-8/gcc-8.3.0/mpc-1.1.0/lib:/apps/gcc-8/gcc-8.3.0/gmp-6.1.2/lib'
-        CPATH: '/apps/gcc-8/gcc-8.3.0/include'
-    extra_rpaths: []
 - compiler:
     spec: [email protected]
     paths:

configs/sites/orion/packages.yaml

@@ -1,10 +1,8 @@
 packages:
   all:
     compiler:: [[email protected], [email protected]]
-    #compiler:: [[email protected]]
     providers:
       mpi:: [[email protected], [email protected]]
-      #mpi:: [[email protected]]
 
 ### MPI, Python, MKL
   mpi:
@@ -15,12 +13,6 @@ packages:
       prefix: /apps/intel-2022.1.2/intel-2022.1.2
       modules:
       - impi/2022.1.2
-  intel-mpi:
-    externals:
-    - spec: [email protected]%[email protected]
-      prefix: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/mpi
-      modules:
-      - impi/2018.4
   openmpi:
     externals:
     - spec: [email protected]%[email protected]~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath