From 99bf0397d6b8b55950b1237ab3305863c4744dec Mon Sep 17 00:00:00 2001
From: Orion Eiger <eiger@slac.stanford.edu>
Date: Wed, 29 May 2024 14:15:16 -0700
Subject: [PATCH] Turn on sasquatch dispatch for all steps

---
 examples/hsc_rc2_subset_setup.sh                      | 2 +-
 examples/script.sh                                    | 8 ++++----
 src/lsst/cm/prod/configs/DC2/test/dc2_bps_template.sh | 2 +-
 src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml   | 4 ++++
 src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml   | 4 ++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/examples/hsc_rc2_subset_setup.sh b/examples/hsc_rc2_subset_setup.sh
index 4aacde1..ec132b8 100644
--- a/examples/hsc_rc2_subset_setup.sh
+++ b/examples/hsc_rc2_subset_setup.sh
@@ -7,7 +7,7 @@ source $EXAMPLES/common_setup.sh
 config="hsc_rc2_subset.yaml"
 config_name="hsc_rc2_subset"
 p_name="HSC_rc2_subset"
-lsst_version="w_2024_03"
+lsst_version="w_2024_20"
 c_name="${lsst_version}_sasquatch_test"
 fullname="${p_name}/${c_name}"
 db_path="output/cm_${p_name}_${c_name}.db"
diff --git a/examples/script.sh b/examples/script.sh
index 4d72177..f4b2866 100644
--- a/examples/script.sh
+++ b/examples/script.sh
@@ -11,24 +11,24 @@ read -p "Which config would you like to use? (HSC-RC2, rc2_subset, DC2_test-med-
 while [ $valid_config = false ]; do
     if [ $CONFIG = 'HSC-RC2' ]
     then
-        butler_repo='/sdf/group/rubin/repo/main'
+        butler_repo='/repo/main+sasquatch_dev'
         source $EXAMPLES/hsc_weekly_setup.sh
         valid_config=true
         daemon_options="--max-running 10 --sleep-time 300"
     elif [ $CONFIG = 'rc2_subset' ]
     then
-        butler_repo='/repo/main.sasquatch_dev.yaml'
+        butler_repo='/repo/main+sasquatch_dev'
         source $EXAMPLES/hsc_rc2_subset_setup.sh
         valid_config=true
     elif [ $CONFIG = 'DC2_test-med-1' ]
     then
-        butler_repo='/sdf/group/rubin/repo/dc2'
+        butler_repo='/repo/dc2+sasquatch_dev'
         source $EXAMPLES/dc2_test-med-1_setup.sh
         valid_config=true
         daemon_options="--max-running 10 --sleep-time 300"
     elif [ $CONFIG = 'micro' ]
     then
-        butler_repo='/sdf/group/rubin/repo/main'
+        butler_repo='/repo/main+sasquatch_dev'
         source $EXAMPLES/hsc_rc2_singleframe_micro_setup.sh
         valid_config=true
         daemon_options="--max-running 10 --sleep-time 30"
diff --git a/src/lsst/cm/prod/configs/DC2/test/dc2_bps_template.sh b/src/lsst/cm/prod/configs/DC2/test/dc2_bps_template.sh
index e3951a8..14490a3 100644
--- a/src/lsst/cm/prod/configs/DC2/test/dc2_bps_template.sh
+++ b/src/lsst/cm/prod/configs/DC2/test/dc2_bps_template.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S -i CM_PROD_DIR="${CM_PROD_DIR}" HOME="${HOME}" bash
+#!/usr/bin/env -S -i CM_PROD_DIR="${CM_PROD_DIR}" HOME="${HOME}" DAF_BUTLER_REPOSITORY_INDEX=/sdf/group/rubin/shared/data-repos.yaml bash
 
 # The shebang lines above are needed b/c setup lsst_distrib in putting
 # the lsst python _after_ the virtual env python in the PATH, which
diff --git a/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml b/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml
index db86450..935c12c 100644
--- a/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml
+++ b/src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml
@@ -25,3 +25,7 @@ finalJob:
 numberOfRetries: 3
 
 priority: 1000
+
+extraQgraphOptions: >-
+  -c parameters:sasquatch_dataset_identifier=DC2/TestMed1
+  -c parameters:sasquatch_timestamp_version=reference_package_timestamp
diff --git a/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml b/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml
index ce6a88b..7ce61b9 100644
--- a/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml
+++ b/src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml
@@ -22,3 +22,7 @@ finalJob:
     --register-dataset-types
 
 priority: 1000
+
+extraQgraphOptions: >-
+  -c parameters:sasquatch_dataset_identifier=HSC/RC2
+  -c parameters:sasquatch_timestamp_version=reference_package_timestamp