Skip to content

DM-55655: pin CONDA_OVERRIDE_GLIBC=2.17 during ./bin/deploy #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roceb merged 4 commits into from
Jul 31, 2026
Merged

DM-55655: pin CONDA_OVERRIDE_GLIBC=2.17 during ./bin/deploy #116

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd99e59
fix(jenkins_wrapper): pin CONDA_OVERRIDE_GLIBC=2.17 during ./bin/deploy
roceb Jul 24, 2026
0a9d783
Limit GLIBC setting only in rubinenv 13 and x86
Jul 30, 2026
63972cb
Add LSST_GLIBC_FLAG
Jul 31, 2026
5d7f089
fix typo in jenkins_wrapper.sh
roceb Jul 31, 2026
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
16 changes: 16 additions & 0 deletions jenkins_wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ LSST_DEPLOY_MODE=${LSST_DEPLOY_MODE:-}
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_REFS=${LSST_REFS:-}

fatal_vars() {
Expand Down Expand Up @@ -92,6 +93,18 @@ if [[ $LSST_DEPLOY_MODE == bleed ]]; then
OPTS+=('-b')
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
# packages that run on RHEL7-era hosts such as USDF cvmfs. Only affects the
# env create/install done by ./bin/deploy; unset before the build runs so it
# never influences runtime. Linux/x86_64 only -- irrelevant on macOS, and we
# don't override glibc on aarch64. We also need to pass a flag from Jenkins to
# avoid false positives.
if [[ $LSST_GLIBC_FLAG = "true" && $(uname -s) == Linux && $(uname -m) == x86_64 ]] && \
[[ $(printf '%s\n' "13.0.0" "$LSST_SPLENV_REF" | sort -V | tail -n1) == "$LSST_SPLENV_REF" ]]; then

@timj timj Jul 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cute way of doing a version comparison.

export CONDA_OVERRIDE_GLIBC=2.17
fi

if [[ -z "$RUBINENV_ORG_FORK" ]]; then
# The LSST_SPLENV_REF can refer to a rubin-env version
# or to an old scipipe_conda_env SHA1
Expand All @@ -116,6 +129,9 @@ else
LSST_CONDA_ENV_NAME="$(cat rubinenv-feedstock/env.name)"
fi

# glibc override applies only to the env-create step above, never at build/runtime
unset CONDA_OVERRIDE_GLIBC

export LSST_CONDA_ENV_NAME

"${SCRIPT_DIR}/lsstswBuild.sh" "${ARGS[@]}"
Expand Down
Loading