Merge branch 'mark4_ingest_on_lustre' into 'main'

Mark4 ingest obs run on lustre

See merge request !1478

shared/workspaces/alembic/versions/08090cb7acc4_add_mark4_observation_ingestion_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
+should_transfer_files = NO
 +WantIOProxy = True
-
 request_memory = {{ramInGb}}
 getenv = True
 environment = "CAPO_PATH=/home/casa/capo"
-
 requirements = HasLustre == True
 
 queue
@@ -43,13 +38,15 @@ queue
 ingest_mk_four_obs_sh = """#!/bin/sh
 set -o errexit
 
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
 # Get NGAS hosts and set up variables to randomly select one
-NGASHOSTSTR=$(./pycapo -q archive-ingestion.NGASHosts)
+NGASHOSTSTR=$($SBIN_PATH/pycapo -q archive-ingestion.NGASHosts)
 NGASHOSTARR=(`/bin/echo ${NGASHOSTSTR}`) # Put the space-delimited host list into an array
 NGASHOSTLEN=${#NGASHOSTARR[@]}
 
 # Copy from the difx area to the Workspaces staging area
-WSSTAGINGDIR=$(./pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
+WSSTAGINGDIR=$($SBIN_PATH/pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
 /bin/cp -r $1 $WSSTAGINGDIR
 
 OBSDIR=$(/bin/basename $1)

shared/workspaces/alembic/versions/91091612b6d0_mark4_workflow_renaming.py

@@ -19,13 +19,15 @@ depends_on = None
 old_ingest_mk_four_obs_sh = """#!/bin/sh
 set -o errexit
 
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
 # Get NGAS hosts and set up variables to randomly select one
-NGASHOSTSTR=$(./pycapo -q archive-ingestion.NGASHosts)
+NGASHOSTSTR=$($SBIN_PATH/pycapo -q archive-ingestion.NGASHosts)
 NGASHOSTARR=(`/bin/echo ${NGASHOSTSTR}`) # Put the space-delimited host list into an array
 NGASHOSTLEN=${#NGASHOSTARR[@]}
 
 # Copy from the difx area to the Workspaces staging area
-WSSTAGINGDIR=$(./pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
+WSSTAGINGDIR=$($SBIN_PATH/pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
 /bin/cp -r $1 $WSSTAGINGDIR
 
 OBSDIR=$(/bin/basename $1)
@@ -54,13 +56,15 @@ set -o errexit
 ingested=$1.ingested
 failed=$1.failed
 
+SBIN_PATH=/lustre/aoc/cluster/pipeline/$CAPO_PROFILE/workspaces/sbin
+
 # Get NGAS hosts and set up variables to randomly select one
-NGASHOSTSTR=$(./pycapo -q archive-ingestion.NGASHosts)
+NGASHOSTSTR=$($SBIN_PATH/pycapo -q archive-ingestion.NGASHosts)
 NGASHOSTARR=(`/bin/echo ${NGASHOSTSTR}`) # Put the space-delimited host list into an array
 NGASHOSTLEN=${#NGASHOSTARR[@]}
 
 # Copy from the difx area to the Workspaces staging area
-WSSTAGINGDIR=$(./pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
+WSSTAGINGDIR=$($SBIN_PATH/pycapo -q edu.nrao.workspaces.IngestionSettings.stagingDirectory)
 /bin/cp -r $1 $WSSTAGINGDIR
 
 OBSDIR=$(/bin/basename $1)