Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 38323e4

Browse files
committed
use spack branch only if specified
1 parent 76d5d9d commit 38323e4

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

tests/jenkins/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pipeline {
55
parameters {
66
string(name: 'sha1', defaultValue: 'master',
77
description: 'What branch of CoreNeuron to test.')
8-
string(name: 'SPACK_BRANCH', defaultValue: 'develop',
8+
string(name: 'SPACK_BRANCH', defaultValue: '',
99
description: 'Which branch of spack to use.')
1010
string(name: 'NEURON_BRANCH', defaultValue: '',
1111
description: 'Which branch of neuron to use. For master branch (neuron@develop) leave this parameter blank.')

tests/jenkins/spack_setup.sh

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ install_spack() (
1616
mkdir -p $BASEDIR && cd $BASEDIR
1717
rm -rf .spack # CLEANUP SPACK CONFIGS
1818
SPACK_REPO=https://github.com/BlueBrain/spack.git
19-
SPACK_BRANCH=${SPACK_BRANCH:-"develop"}
2019

21-
echo "Installing SPACK. Cloning $SPACK_REPO $SPACK_ROOT --depth 1 -b $SPACK_BRANCH"
22-
git clone $SPACK_REPO $SPACK_ROOT --depth 1 -b $SPACK_BRANCH
20+
# cloning branch option
21+
BRANCH_OPT=""
22+
if [ -n "$SPACK_BRANCH" ]; then
23+
BRANCH_OPT="-b ${SPACK_BRANCH}"
24+
fi
25+
26+
echo "Installing SPACK. Cloning $SPACK_REPO $SPACK_ROOT --depth 1 $BRANCH_OPT"
27+
git clone $SPACK_REPO $SPACK_ROOT --depth 1 $BRANCH_OPT
28+
2329
# Use BBP configs
2430
mkdir -p $SPACK_ROOT/etc/spack/defaults/linux
2531
cp /gpfs/bbp.cscs.ch/apps/hpc/jenkins/config/*.yaml $SPACK_ROOT/etc/spack/

0 commit comments

Comments
 (0)