Remove extraneous content from bps yaml templates and enable clusteri…

…ng for DC2 test-med-1 by default

src/lsst/cm/prod/configs/DC2/test/dc2_template.yaml

@@ -3,6 +3,8 @@ imports:
 
 includeConfigs:
   - ${CTRL_BPS_PANDA_DIR}/config/bps_usdf.yaml
+# To use clustering, leave the following line uncommented:
+  - ${DRP_PIPE_DIR}/bps/clustering/LSSTCam-imSim/DRP-DC2-clustering.yaml
   - ${DRP_PIPE_DIR}/bps/resources/LSSTCam-imSim/DRP-test-med-1.yaml
 # The above is all that's needed to request only the memory specified in the
 # drp_pipe defaults which should be updated regularly. To use custom memory
@@ -11,17 +13,6 @@ includeConfigs:
 
 custom_lsst_setup: ""
 
-# turn off the -o option in pipetask commands
-pipetaskOutput: ""
-
-executionButler:
-  requestMemory: 64000
-  queue: "SLAC_Rubin_Merge"
-  # turn off chaining in the execution butler because
-  # no output collection
-  command2: ""
-  command3: ""
-
 numberOfRetries: 3
 
 priority: 1000

src/lsst/cm/prod/configs/HSC/test/hsc_template.yaml

@@ -12,17 +12,4 @@ numberOfRetries: 3
 
 custom_lsst_setup: ""
 
-# turn off the -o option in pipetask commands
-pipetaskOutput: ""
-
-executionButler:
-  requestMemory: 64000
-  queue: "SLAC_Rubin_Merge"
-  # turn off chaining in the execution butler because
-  # no output collection
-  command2: ""
-  command3: ""
-
 priority: 1000
-
-fileDistributionEndPoint: "file:///sdf/data/rubin/panda_jobs/panda_cache/{operator}/panda_cache_box/{payloadFolder}/{uniqProcName}/"