Commit 27ac16d7 authored by Philip Carns's avatar Philip Carns

clean up cooley nightly builds

- no longer any need for fork of spack (PR merged)
- no longer any need for @develop libfabric
parent b14fcaaa
...@@ -26,7 +26,7 @@ cp bake-regression.qsub $JOBDIR ...@@ -26,7 +26,7 @@ cp bake-regression.qsub $JOBDIR
cp pmdk-regression.qsub $JOBDIR cp pmdk-regression.qsub $JOBDIR
cd $SANDBOX cd $SANDBOX
git clone https://github.com/carns/spack.git git clone https://github.com/spack/spack.git
git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git git clone https://xgitlab.cels.anl.gov/sds/sds-repo.git
git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git git clone https://xgitlab.cels.anl.gov/sds/sds-tests.git
wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz wget http://mvapich.cse.ohio-state.edu/download/mvapich/osu-micro-benchmarks-5.3.2.tar.gz
...@@ -36,7 +36,6 @@ git clone https://github.com/pdlfs/mercury-runner.git ...@@ -36,7 +36,6 @@ git clone https://github.com/pdlfs/mercury-runner.git
# set up most of the libraries in spack # set up most of the libraries in spack
echo "=== BUILD SPACK PACKAGES AND LOAD ===" echo "=== BUILD SPACK PACKAGES AND LOAD ==="
cd $SANDBOX/spack cd $SANDBOX/spack
git checkout carns/dev-shell-detection
. $SANDBOX/spack/share/spack/setup-env.sh . $SANDBOX/spack/share/spack/setup-env.sh
spack compiler find spack compiler find
spack compilers spack compilers
...@@ -50,9 +49,8 @@ echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml ...@@ -50,9 +49,8 @@ echo "repos:" > $SPACK_ROOT/etc/spack/repos.yaml
echo "- ${SANDBOX}/sds-repo" >> $SPACK_ROOT/etc/spack/repos.yaml echo "- ${SANDBOX}/sds-repo" >> $SPACK_ROOT/etc/spack/repos.yaml
spack bootstrap spack bootstrap
spack uninstall -R -y argobots mercury rdma-core libfabric || true spack uninstall -R -y argobots mercury rdma-core libfabric || true
# 2018-11-5 using @develop for mercury and libfabric to test wait_fd spack install --dirty ssg
spack install --dirty ssg ^mercury@develop ^libfabric@develop spack install --dirty bake
spack install --dirty bake ^mercury@develop ^libfabric@develop
# deliberately repeat setup-env step after building modules to ensure # deliberately repeat setup-env step after building modules to ensure
# that we pick up the right module paths # that we pick up the right module paths
. $SANDBOX/spack/share/spack/setup-env.sh . $SANDBOX/spack/share/spack/setup-env.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment