remove unused spack config scopes and add mirror

healther · healther · commit 584e132eecff · 2018-03-27T13:16:54.000+02:00
* used to break for Jenkins and on slurm nodes
* add spec -I call for debug purposes
* use jenkins queue
* add mirror /wang/.../spack/mirror

Change-Id: I4b5bdf2de7101e0879d927c7cf1f1f443f89ad53
diff --git a/.ci/01_ensure_gcc.sh b/.ci/01_ensure_gcc.sh
@@ -3,11 +3,13 @@
 umask 0002
 
 # ensure that system compiler are available
-rm -f $HOME/.spack/linux/compilers.yaml
+rm -f etc/linux/compilers.yaml
 spack compiler add
+# ensure that our chosen gcc is there
+# make parameter?
 spack fetch -D gcc@7.2.0
-srun -p compile -c8 -t6:00:00 spack install --show-log-on-error gcc@7.2.0
+srun -p jenkins -c8 -t6:00:00 spack install --show-log-on-error gcc@7.2.0
 # remove system compiler
-rm -f $HOME/.spack/linux/compilers.yaml
-# add gcc to local configuration
-spack compiler add --scope site $(spack location -i gcc@7.2.0)
+rm -f etc/linux/compilers.yaml
+# add our gcc
+spack compiler add $(spack location -i gcc@7.2.0)
diff --git a/.ci/02_install.sh b/.ci/02_install.sh
@@ -6,11 +6,12 @@ modulespec=$2
 compiler=$3
 
 spack fetch -D "$modulespec"
+spack spec -I "$modulespec"
 if [ "$4" = "local" ]
 then
     spack install --only dependencies --show-log-on-error -j4 "$modulespec"
 else
-    srun -p compile -c8 -t6:00:00 spack install --only dependencies --show-log-on-error "$modulespec"
+    srun -p jenkins -c8 -t6:00:00 spack install --only dependencies --show-log-on-error "$modulespec"
 fi
 # fancy bash-magic to get the hash of the installed package
 newhash=$(spack install --show-log-on-error -j4 "$modulespec" | tail -n1 | tr "-" "\n" | tail -n1)
diff --git a/etc/spack/mirrors.yaml b/etc/spack/mirrors.yaml
@@ -0,0 +1,2 @@
+mirrors:
+  global: file:///wang/environment/software/jessie/spack/mirror
diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py
@@ -216,22 +216,11 @@ def __repr__(self):
 ConfigScope('defaults', _defaults_path)
 ConfigScope('defaults/%s' % _platform, os.path.join(_defaults_path, _platform))
 
-#: System configuration is per machine.
-#: No system-level configs should be checked into spack by default
-_system_path = os.path.join(spack.system_etc_path, 'spack')
-ConfigScope('system', _system_path)
-ConfigScope('system/%s' % _platform, os.path.join(_system_path, _platform))
 
 #: Site configuration is per spack instance, for sites or projects.
 #: No site-level configs should be checked into spack by default.
 _site_path = os.path.join(spack.etc_path, 'spack')
 ConfigScope('site', _site_path)
-ConfigScope('site/%s' % _platform, os.path.join(_site_path, _platform))
-
-#: User configuration can override both spack defaults and site config.
-_user_path = spack.user_config_path
-ConfigScope('user', _user_path)
-ConfigScope('user/%s' % _platform, os.path.join(_user_path, _platform))
 
 
 def highest_precedence_scope():

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+mirrors:`
	`2`	`+ global: file:///wang/environment/software/jessie/spack/mirror`