Merge pull request #2359 from PDoakORNL/CI_knowns_its_nexus

CI aborts previous runs for PR and has more effective thread throttling.

Author: mdewing

tests/test_automation/Jenkinsfile_ornl_oxygen_cpu

@@ -1,3 +1,3 @@
 library 'qmcpack_shared_jenkins'
 
-common_pipeline(name:"cpu", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen_", ram_disk:true)
+common_pipeline(name:"cpu", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen", workspace_root:"/scratch/jenkins", threads_per_flavor:8)

tests/test_automation/Jenkinsfile_ornl_oxygen_enable_cuda

@@ -1,3 +1,3 @@
 library 'qmcpack_shared_jenkins'
 
-common_pipeline(name: "enable_cuda", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen_", ram_disk:true)
+common_pipeline(name: "enable_cuda", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen", workspace_root:"/scratch/jenkins", threads_per_flavor:8)

tests/test_automation/Jenkinsfile_ornl_oxygen_gpu

@@ -1,3 +1,3 @@
 library 'qmcpack_shared_jenkins'
 
-common_pipeline(name:"gpu", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen_", ram_disk:true)
+common_pipeline(name:"gpu", spack_path:"/var/lib/jenkins/spack", prefix:"ornl_oxygen", workspace_root:"/scratch/jenkins", threads_per_flavor:8)

tests/test_automation/Jenkinsfile_ornl_vm

@@ -1,4 +1,4 @@
 library 'qmcpack_shared_jenkins'
 
-common_pipeline(name:"cpu", spack_path:"/var/lib/jenkins/spack", prefix:"vm_", ram_disk:"false")
+common_pipeline(name:"cpu", spack_path:"/var/lib/jenkins/spack", prefix:"vm", workspace_root:"${env.JENKINS_HOME}/workspace/test_root")
 

tests/test_automation/jenkins_ornl_oxygen.sh

@@ -46,12 +46,12 @@ cd build_${1}_${2}
 
 which cmake
 pwd
-echo "cmake ${QMCNSPACE_FLAG} ${QMCPRECISION_FLAG} -DENABLE_SOA=1 -DCMAKE_C_COMPILER=\"mpicc\" -DCMAKE_CXX_COMPILER=\"mpicxx\" ${QMC_IMMUTABLE_FLAGS} -DQMC_NO_SLOW_CUSTOM_TESTING_COMMANDS=1 ../.. 2>&1 | tee cmake.out"
+echo "cmake ${QMCNSPACE_FLAG} ${QMCPRECISION_FLAG} -DENABLE_SOA=1 -DCMAKE_C_COMPILER=\"mpicc\" -DCMAKE_CXX_COMPILER=\"mpicxx\" ${QMC_IMMUTABLE_FLAGS} -DQMC_NO_SLOW_CUSTOM_TESTING_COMMANDS=1 ${PARENT_WORKSPACE} 2>&1 | tee cmake.out"
 
 # this keeps tee from eating the exit status
 set -o pipefail
 
-cmake ${QMCNSPACE_FLAG} ${QMCPRECISION_FLAG} -DENABLE_SOA=1 -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" ${QMC_IMMUTABLE_FLAGS} -DQMC_NO_SLOW_CUSTOM_TESTING_COMMANDS=1 ../.. 2>&1 | tee ${1}_${2}_cmake.out
+cmake ${QMCNSPACE_FLAG} ${QMCPRECISION_FLAG} -DENABLE_SOA=1 -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" ${QMC_IMMUTABLE_FLAGS} -DQMC_NO_SLOW_CUSTOM_TESTING_COMMANDS=1 ${PARENT_WORKSPACE} 2>&1 | tee ${1}_${2}_cmake.out
 if [[ $? -ne 0 ]] ; then
   exit 1
 fi

tests/test_automation/ornl_oxygen_spack_env_cpu.sh

@@ -1,8 +1,8 @@
 #/bin/bash
 
-. $SPACK_ROOT/share/spack/setup-env.sh
-
-. ../tests/test_automation/spack_supported_package_versions.sh
+SRC="${BASH_SOURCE[0]}"
+SRC_DIR="$( cd -P "$( dirname "$SRC" )" >/dev/null 2>&1 && pwd )"
+. ${SRC_DIR}/start_spack_env.sh
 
 #temporary change from clang$llvm_vnew
 

tests/test_automation/ornl_oxygen_spack_env_enable_cuda.sh

@@ -1,8 +1,8 @@
 #/bin/bash
 
-. $SPACK_ROOT/share/spack/setup-env.sh
-
-. ../tests/test_automation/spack_supported_package_versions.sh
+SRC="${BASH_SOURCE[0]}"
+SRC_DIR="$( cd -P "$( dirname "$SRC" )" >/dev/null 2>&1 && pwd )"
+. ${SRC_DIR}/start_spack_env.sh
 
 QMC_IMMUTABLE_FLAGS="-DENABLE_CUDA=1"
 

tests/test_automation/ornl_oxygen_spack_env_gpu.sh

@@ -1,8 +1,8 @@
 #/bin/bash
 
-. $SPACK_ROOT/share/spack/setup-env.sh
-
-. ../tests/test_automation/spack_supported_package_versions.sh
+SRC="${BASH_SOURCE[0]}"
+SRC_DIR="$( cd -P "$( dirname "$SRC" )" >/dev/null 2>&1 && pwd )"
+. ${SRC_DIR}/start_spack_env.sh
 
 QMC_IMMUTABLE_FLAGS="-DQMC_CUDA=1"
 

tests/test_automation/start_spack_env.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# This shared script fragment start spack and loads in QMCPACKS currently supported versions of compilers
+# and libraries
+
+. $SPACK_ROOT/share/spack/setup-env.sh
+
+# This is to deal with the fact that we don't know the relationship between the working directory
+# and checkout directory in a relative way.
+# this doesn't deal with symlinks
+SRC="${BASH_SOURCE[0]}"
+SRC_DIR="$( cd -P "$( dirname "$SRC" )" >/dev/null 2>&1 && pwd )"
+
+. ${SRC_DIR}/spack_supported_package_versions.sh

tests/test_automation/vm_spack_env_cpu.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-. $SPACK_ROOT/share/spack/setup-env.sh
-
-. ../tests/test_automation/spack_supported_package_versions.sh
+SRC="${BASH_SOURCE[0]}"
+SRC_DIR="$( cd -P "$( dirname "$SRC" )" >/dev/null 2>&1 && pwd )"
+. ${SRC_DIR}/start_spack_env.sh
 
 spack load gcc@$gcc_vnew%gcc@$gcc_vold
 spack load boost@$boost_vnew%gcc@$gcc_vnew