From 3efa8aaaf96e80535aebc370c3b2819192867092 Mon Sep 17 00:00:00 2001
From: Ross <ro@noirlab.edu>
Date: Wed, 5 Aug 2026 23:26:20 -0400
Subject: [PATCH 1/2] Add env var to allow for building RSP

---
 jenkins_wrapper.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jenkins_wrapper.sh b/jenkins_wrapper.sh
index 2c69271..444f517 100755
--- a/jenkins_wrapper.sh
+++ b/jenkins_wrapper.sh
@@ -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() {
@@ -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
@@ -121,7 +125,8 @@ if [[ -z "$RUBINENV_ORG_FORK" ]]; then
     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[@]}"

From 6f9c6ce10f15213a8647d344959dc03a5c0dc51f Mon Sep 17 00:00:00 2001
From: Ross <ross.ceballo@noirlab.edu>
Date: Thu, 20 Aug 2026 10:03:52 -0700
Subject: [PATCH 2/2] Pass deploy opts as separate args in the eups tag path

The -x branch expanded "${OPTS[*]}", joining every option into a single
argv word. With both bleed and RSP set, deploy received the literal
"-b -R" and getopts rejected it; with no options set it received a stray
empty argument. Use "${OPTS[@]}" as the other two branches already do.

Generated with AI

Co-Authored-By: SLAC AI
---
 jenkins_wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins_wrapper.sh b/jenkins_wrapper.sh
index 444f517..bbaa297 100755
--- a/jenkins_wrapper.sh
+++ b/jenkins_wrapper.sh
@@ -120,7 +120,7 @@ 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