From 9084794cd83f0c99e695c253f9a44e80953a4814 Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Mon, 11 Mar 2024 13:52:11 -0400
Subject: [PATCH] I don't think wildcards work in nraorsync so we won't be able
to transfer *.flagtemplate.txt, not doing transfers at all now (like
vlass_cal)
---
.../templates/vlass_coarse/envoy_condor_2.8.3.txt | 10 +---------
.../templates/vlass_quicklook/envoy_condor_2.8.3.txt | 9 +--------
.../templates/vlass_seci/envoy_condor_2.8.3.txt | 9 +--------
3 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/shared/workspaces/alembic/versions/templates/vlass_coarse/envoy_condor_2.8.3.txt b/shared/workspaces/alembic/versions/templates/vlass_coarse/envoy_condor_2.8.3.txt
index 554a75886..12d443127 100644
--- a/shared/workspaces/alembic/versions/templates/vlass_coarse/envoy_condor_2.8.3.txt
+++ b/shared/workspaces/alembic/versions/templates/vlass_coarse/envoy_condor_2.8.3.txt
@@ -5,15 +5,7 @@ output = envoy.out
error = envoy.err
log = condor.log
-VLASS_DIR = {{data_location}}
-SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
-VLASS_BIN = /lustre/aoc/cluster/pipeline/vlass_{{vlass_env}}/workspaces/bin
-should_transfer_files = yes
-transfer_input_files = $ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/.matplotlib, nraorsync://$(SBIN_PATH)/pycapo, nraorsync://$(SBIN_PATH)/update_stage, nraorsync://$(SBIN_PATH)/vela, nraorsync://$(SBIN_PATH)/casa_envoy, nraorsync://$(VLASS_BIN)/planescraper, nraorsync://$(VLASS_DIR)/working, nraorsync://$(VLASS_DIR)/rawdata, nraorsync://$(VLASS_DIR)/products{{#remote}}, nraorsync://$(VLASS_DIR)/{{profile}}.properties{{/remote}}, nraorsync://$(VLASS_DIR)/PPR.xml, nraorsync://$(VLASS_DIR)/*flagtemplate.txt, nraorsync://$(VLASS_DIR)/metadata.json
-when_to_transfer_output = ON_EXIT
-transfer_output_files = .job.ad
-+nrao_output_files = "working products planes.json"
-output_destination = nraorsync://$(VLASS_DIR)
+should_transfer_files = NO
+WantIOProxy = True
request_cpus = {{requested_parallel}}
diff --git a/shared/workspaces/alembic/versions/templates/vlass_quicklook/envoy_condor_2.8.3.txt b/shared/workspaces/alembic/versions/templates/vlass_quicklook/envoy_condor_2.8.3.txt
index 55fd4b127..4ff051992 100644
--- a/shared/workspaces/alembic/versions/templates/vlass_quicklook/envoy_condor_2.8.3.txt
+++ b/shared/workspaces/alembic/versions/templates/vlass_quicklook/envoy_condor_2.8.3.txt
@@ -5,14 +5,7 @@ output = envoy.out
error = envoy.err
log = condor.log
-SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
-VLASS_DIR = {{data_location}}
-should_transfer_files = yes
-transfer_input_files = {{#radial}}$ENV(HOME)/.ssh/condor_ssh_config, {{/radial}}$ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/.matplotlib, nraorsync://$(SBIN_PATH)/pycapo, nraorsync://$(SBIN_PATH)/update_stage, nraorsync://$(SBIN_PATH)/casa_envoy, nraorsync://$(SBIN_PATH)/vela, nraorsync://$(VLASS_DIR)/working, nraorsync://$(VLASS_DIR)/rawdata, nraorsync://$(VLASS_DIR)/products{{#remote}}, nraorsync://$(VLASS_DIR)/{{profile}}.properties{{/remote}}, nraorsync://$(VLASS_DIR)/PPR.xml, nraorsync://$(VLASS_DIR)/*flagtemplate.txt, nraorsync://$(VLASS_DIR)/metadata.json{{files_to_transfer}}
-transfer_output_files = .job.ad
-+nrao_output_files = "working products"
-when_to_transfer_output = ON_EXIT
-output_destination = nraorsync://$(VLASS_DIR)
+should_transfer_files = NO
+WantIOProxy = True
{{#radial}}
universe = grid
diff --git a/shared/workspaces/alembic/versions/templates/vlass_seci/envoy_condor_2.8.3.txt b/shared/workspaces/alembic/versions/templates/vlass_seci/envoy_condor_2.8.3.txt
index 3a037b13d..c45ab98cf 100644
--- a/shared/workspaces/alembic/versions/templates/vlass_seci/envoy_condor_2.8.3.txt
+++ b/shared/workspaces/alembic/versions/templates/vlass_seci/envoy_condor_2.8.3.txt
@@ -5,14 +5,7 @@ output = envoy.out
error = envoy.err
log = condor.log
-VLASS_DIR = {{data_location}}
-SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
-should_transfer_files = yes
-transfer_input_files = $ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/.matplotlib, nraorsync://$(SBIN_PATH)/pycapo, nraorsync://$(SBIN_PATH)/update_stage, nraorsync://$(SBIN_PATH)/vela, nraorsync://$(SBIN_PATH)/casa_envoy, nraorsync://$(VLASS_DIR)/working, nraorsync://$(VLASS_DIR)/rawdata, nraorsync://$(VLASS_DIR)/products{{#remote}}, nraorsync://$(VLASS_DIR)/{{profile}}.properties{{/remote}}, nraorsync://$(VLASS_DIR)/PPR.xml, nraorsync://$(VLASS_DIR)/*flagtemplate.txt, nraorsync://$(VLASS_DIR)/metadata.json
-when_to_transfer_output = ON_EXIT
-transfer_output_files = .job.ad
-+nrao_output_files = "working products"
-output_destination = nraorsync://$(VLASS_DIR)
+should_transfer_files = NO
+WantIOProxy = True
request_memory = 50G
--
GitLab