From 1d2cfe2eed5453f41ed8e253faaf3f8153870d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Wed, 1 Dec 2021 14:47:01 +0100 Subject: [PATCH 1/3] Fix spack commit --- .jenkins/stuttgart/Jenkinsfile-POWER9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.jenkins/stuttgart/Jenkinsfile-POWER9 b/.jenkins/stuttgart/Jenkinsfile-POWER9 index 6b6dd3848..ef588159d 100644 --- a/.jenkins/stuttgart/Jenkinsfile-POWER9 +++ b/.jenkins/stuttgart/Jenkinsfile-POWER9 @@ -74,8 +74,8 @@ pipeline { sh ''' srun -p sgs-only -N 1 -n 1 -t 03:00:00 bash -c "\ cd /scratch && \ - mkdir -p jenkins && cd jenkins; \ - if [[ ! -d spack ]]; then git clone --depth 1 https://github.com/spack/spack.git;fi; \ + mkdir -p jenkins && cd jenkins && rm -rf spack; \ + if [[ ! -d spack ]]; then git clone -b v0.17 --depth 1 https://github.com/spack/spack.git;fi; \ source spack/share/spack/setup-env.sh && \ spack install cmake@3.17.1 && \ spack load cmake@3.17.1 && echo 'Successfully installed/loaded spack cmake'" From 548af29c8bc1301cc9a45ff1d5e6891fb9656451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Wed, 1 Dec 2021 15:10:06 +0100 Subject: [PATCH 2/3] Cache spack inbetween builds --- .jenkins/stuttgart/Jenkinsfile-POWER9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins/stuttgart/Jenkinsfile-POWER9 b/.jenkins/stuttgart/Jenkinsfile-POWER9 index ef588159d..6a2264022 100644 --- a/.jenkins/stuttgart/Jenkinsfile-POWER9 +++ b/.jenkins/stuttgart/Jenkinsfile-POWER9 @@ -74,7 +74,7 @@ pipeline { sh ''' srun -p sgs-only -N 1 -n 1 -t 03:00:00 bash -c "\ cd /scratch && \ - mkdir -p jenkins && cd jenkins && rm -rf spack; \ + mkdir -p jenkins && cd jenkins; \ if [[ ! -d spack ]]; then git clone -b v0.17 --depth 1 https://github.com/spack/spack.git;fi; \ source spack/share/spack/setup-env.sh && \ spack install cmake@3.17.1 && \ From 8f64789370c9f0b2dd0b80a85151eeba50e4911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gregor=20Dai=C3=9F?= Date: Wed, 1 Dec 2021 15:13:33 +0100 Subject: [PATCH 3/3] Enforce tests running exclusively --- .jenkins/stuttgart/Jenkinsfile-POWER9 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.jenkins/stuttgart/Jenkinsfile-POWER9 b/.jenkins/stuttgart/Jenkinsfile-POWER9 index 6a2264022..01b402b9c 100644 --- a/.jenkins/stuttgart/Jenkinsfile-POWER9 +++ b/.jenkins/stuttgart/Jenkinsfile-POWER9 @@ -72,7 +72,7 @@ pipeline { dir('octotiger') { /* Get spack cmake */ sh ''' - srun -p sgs-only -N 1 -n 1 -t 03:00:00 bash -c "\ + srun -p sgs-only -N 1 -n 1 -t 03:00:00 --exclusive bash -c "\ cd /scratch && \ mkdir -p jenkins && cd jenkins; \ if [[ ! -d spack ]]; then git clone -b v0.17 --depth 1 https://github.com/spack/spack.git;fi; \ @@ -83,7 +83,7 @@ pipeline { /* Log into the slurm node, create jenkins dir if not in existence, checkout octotiger and the buildscripts (OctoTigerToolChain), move octotiger src to the correct folder within the buildscripts, download silo */ sh ''' - srun -p sgs-only -N 1 -n 1 -t 03:00:00 bash -c "\ + srun -p sgs-only -N 1 -n 1 -t 03:00:00 --exclusive bash -c "\ cd /scratch && \ mkdir -p jenkins && cd jenkins && \ mkdir -p octotiger-${JOB_BASE_NAME} && cd octotiger-${JOB_BASE_NAME} && \ @@ -116,7 +116,7 @@ pipeline { stage('build') { steps { sh ''' - srun -p sgs-only -N 1 -n 1 -t 02:00:00 -D /data/scratch/jenkins/octotiger-${JOB_BASE_NAME}/OctoTigerBuildChain bash -c \ + srun -p sgs-only -N 1 -n 1 -t 02:00:00 --exclusive -D /data/scratch/jenkins/octotiger-${JOB_BASE_NAME}/OctoTigerBuildChain bash -c \ "source /scratch/jenkins/spack/share/spack/setup-env.sh && spack load cmake@3.17.1 &&\ module load gcc/8.2.0 && module load cuda/10.2 &&\ ./build-all.sh Release with-CC with-cuda without-mpi without-papi without-apex with-kokkos with-simd without-hpx-backend-multipole without-hpx-backend-monopole with-hpx-cuda-polling " @@ -126,7 +126,7 @@ pipeline { stage('ctest-all') { steps { sh ''' - srun -p sgs-only -N 1 -n 1 -t 02:00:00 -D /data/scratch/jenkins/octotiger-${JOB_BASE_NAME}/OctoTigerBuildChain/build/octotiger/build bash -c \ + srun -p sgs-only -N 1 -n 1 -t 02:00:00 --exclusive -D /data/scratch/jenkins/octotiger-${JOB_BASE_NAME}/OctoTigerBuildChain/build/octotiger/build bash -c \ "source /scratch/jenkins/spack/share/spack/setup-env.sh && spack load cmake@3.17.1 &&\ module load gcc/8.2.0 && module load cuda/10.2 && ctest --output-on-failure" '''