Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions jenkins_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ LSST_NO_FETCH=${LSST_NO_FETCH:-false}
LSST_NO_BINARY_FETCH=${LSST_NO_BINARY_FETCH:-true}
LSST_PREP_ONLY=${LSST_PREP_ONLY:-false}
LSST_GLIBC_FLAG=${LSST_GLIBC_FLAG:-false}
LSST_ADD_RSP=${LSST_ADD_RSP:-false}
LSST_REFS=${LSST_REFS:-}

fatal_vars() {
Expand Down Expand Up @@ -92,6 +93,9 @@ OPTS=()
if [[ $LSST_DEPLOY_MODE == bleed ]]; then
OPTS+=('-b')
fi
if [[ $LSST_ADD_RSP == true ]]; then
OPTS+=('-R')
fi

# Force the conda solver to target glibc 2.17 so the rebuild's conda env
# (captured in stack/src/env/<tag>.env via `conda list --explicit`) resolves
Expand All @@ -116,12 +120,13 @@ if [[ -z "$RUBINENV_ORG_FORK" ]]; then
# pre instroduction of rubin-env
./bin/deploy -r "$LSST_SPLENV_REF" "${OPTS[@]}"
elif [[ $LSST_SPLENV_REF == [dsvw]* ]]; then
./bin/deploy -x "$LSST_SPLENV_REF" "${OPTS[*]}"
./bin/deploy -x "$LSST_SPLENV_REF" "${OPTS[@]}"
else
echo "Unrecognized environment reference: $LSST_SPLENV_REF"
exit 1
fi
LSST_CONDA_ENV_NAME="lsst-scipipe-${LSST_SPLENV_REF}"
suffix=$([ "$LSST_ADD_RSP" = true ] && echo "-rsp" || echo "")
LSST_CONDA_ENV_NAME="lsst-scipipe-${LSST_SPLENV_REF}${suffix}"
else
# build and deploy a rubinenv environment from fork/branch
./bin/deploy -v "$LSST_SPLENV_REF" "${OPTS[@]}"
Expand Down
Loading