use spack branch only if specified

BlueBrain · Jan 6, 2021 · 38323e4 · 38323e4
1 parent 76d5d9d
commit 38323e4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/tests/jenkins/Jenkinsfile b/tests/jenkins/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
     parameters {
         string(name: 'sha1', defaultValue: 'master',
                description: 'What branch of CoreNeuron to test.')
-        string(name: 'SPACK_BRANCH', defaultValue: 'develop',
+        string(name: 'SPACK_BRANCH', defaultValue: '',
                description: 'Which branch of spack to use.')
         string(name: 'NEURON_BRANCH', defaultValue: '',
                description: 'Which branch of neuron to use. For master branch (neuron@develop) leave this parameter blank.')

diff --git a/tests/jenkins/spack_setup.sh b/tests/jenkins/spack_setup.sh
@@ -16,10 +16,16 @@ install_spack() (
     mkdir -p $BASEDIR && cd $BASEDIR
     rm -rf .spack   # CLEANUP SPACK CONFIGS
     SPACK_REPO=https://github.com/BlueBrain/spack.git
-    SPACK_BRANCH=${SPACK_BRANCH:-"develop"}
 
-    echo "Installing SPACK. Cloning $SPACK_REPO $SPACK_ROOT --depth 1 -b $SPACK_BRANCH"
-    git clone $SPACK_REPO $SPACK_ROOT --depth 1 -b $SPACK_BRANCH
+    # cloning branch option
+    BRANCH_OPT=""
+    if [ -n "$SPACK_BRANCH" ]; then
+        BRANCH_OPT="-b ${SPACK_BRANCH}"
+    fi
+
+    echo "Installing SPACK. Cloning $SPACK_REPO $SPACK_ROOT --depth 1 $BRANCH_OPT"
+    git clone $SPACK_REPO $SPACK_ROOT --depth 1 $BRANCH_OPT
+
     # Use BBP configs
     mkdir -p $SPACK_ROOT/etc/spack/defaults/linux
     cp /gpfs/bbp.cscs.ch/apps/hpc/jenkins/config/*.yaml $SPACK_ROOT/etc/spack/