From 8833de56416e29be5c8500b625df96feba21c27a Mon Sep 17 00:00:00 2001
From: Daniel Nemergut <dnemergu@nrao.edu>
Date: Tue, 17 Oct 2023 17:15:59 -0400
Subject: [PATCH] No longer transferring files into the container, running from
lustre directly
---
.../versions/491102d56809_add_ingest_obs_workflow.py | 11 ++++-------
.../569416c40ca8_ingest_obs_workflow_renaming.py | 8 ++++++--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/shared/workspaces/alembic/versions/491102d56809_add_ingest_obs_workflow.py b/shared/workspaces/alembic/versions/491102d56809_add_ingest_obs_workflow.py
index e52410afd..2835fc9ad 100644
--- a/shared/workspaces/alembic/versions/491102d56809_add_ingest_obs_workflow.py
+++ b/shared/workspaces/alembic/versions/491102d56809_add_ingest_obs_workflow.py
@@ -24,16 +24,11 @@ output = ingest.out
error = ingest.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, nraorsync://$(SBIN_PATH)/ingest_envoy, nraorsync://$(SBIN_PATH)/ingest, nraorsync://$(SBIN_PATH)/observation-product-collector.sh, ./metadata.json
+should_transfer_files = NO
+WantIOProxy = True
-
request_memory = {{ramInGb}}
getenv = True
environment = "CAPO_PATH=/home/casa/capo"
-
requirements = HasLustre == True
queue
@@ -43,7 +38,9 @@ queue
ingest_obs_sh = """#!/bin/sh
set -o errexit
-./ingest_envoy --observation $1 $2
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
+${SBIN_PATH}/ingest_envoy --observation $1 $2
"""
diff --git a/shared/workspaces/alembic/versions/569416c40ca8_ingest_obs_workflow_renaming.py b/shared/workspaces/alembic/versions/569416c40ca8_ingest_obs_workflow_renaming.py
index d2e3775fa..49308d020 100644
--- a/shared/workspaces/alembic/versions/569416c40ca8_ingest_obs_workflow_renaming.py
+++ b/shared/workspaces/alembic/versions/569416c40ca8_ingest_obs_workflow_renaming.py
@@ -18,7 +18,9 @@ depends_on = None
old_ingest_obs_sh = """#!/bin/sh
set -o errexit
-./ingest_envoy --observation $1 $2
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
+${SBIN_PATH}/ingest_envoy --observation $1 $2
"""
@@ -30,9 +32,11 @@ running=$2.running
ingested=$2.ingested
failed=$2.failed
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
mv $2 $running
-./ingest_envoy --observation $1 $running
+${SBIN_PATH}/ingest_envoy --observation $1 $running
status=$?
[ $status -eq 0 ] && mv $running $ingested || mv $running $failed
--
GitLab