From 21b117064de5e3e677c1dc31af4a5f3f817b590a Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Tue, 17 Oct 2023 10:57:40 -0400
Subject: [PATCH] No longer transferring files into the container, running from
/users/vlapipe directly
---
.../versions/61cbcd1d83f7_mark4_import_workflow.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/shared/workspaces/alembic/versions/61cbcd1d83f7_mark4_import_workflow.py b/shared/workspaces/alembic/versions/61cbcd1d83f7_mark4_import_workflow.py
index f7e4bdaaf..547dbe009 100644
--- a/shared/workspaces/alembic/versions/61cbcd1d83f7_mark4_import_workflow.py
+++ b/shared/workspaces/alembic/versions/61cbcd1d83f7_mark4_import_workflow.py
@@ -24,15 +24,12 @@ output = import.out
error = import.err
log = condor.log
-SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
-SPOOL_DIR = {{spool_dir}}
-should_transfer_files = yes
-transfer_input_files = $ENV(HOME)/.ssh/condor_transfer, nraorsync://$(SBIN_PATH)/pycapo, $(SBIN_PATH)/mark4_import
+should_transfer_files = NO
+WantIOProxy = True
-
request_memory = {{ramInGb}}
getenv = True
environment = "CAPO_PATH=/home/casa/capo"
+requirements = HasLustre == True
queue
@@ -41,7 +38,9 @@ queue
mk_four_import_sh = """#!/bin/sh
set -o errexit
-./mark4_import
+BIN_PATH=/users/vlapipe/workflows/$CAPO_PROFILE/bin
+
+${BIN_PATH}/mark4_import
"""
@@ -49,7 +48,7 @@ set -o errexit
def upgrade():
op.execute(
f"""
- INSERT INTO workflows (workflow_name) VALUES (E'{wf_name}')
+ INSERT INTO workflows (workflow_name, requires_lustre) VALUES (E'{wf_name}', true)
"""
)
--
GitLab