diff --git a/shared/workspaces/alembic/versions/08090cb7acc4_add_mark4_observation_ingestion_workflow.py b/shared/workspaces/alembic/versions/08090cb7acc4_add_mark4_observation_ingestion_workflow.py index a4cca7049e9a4b9d5d62d55aed2d714d2980f0a6..8bd40d1165289618d4e2ed6d478078f85219b253 100644 --- a/shared/workspaces/alembic/versions/08090cb7acc4_add_mark4_observation_ingestion_workflow.py +++ b/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) diff --git a/shared/workspaces/alembic/versions/91091612b6d0_mark4_workflow_renaming.py b/shared/workspaces/alembic/versions/91091612b6d0_mark4_workflow_renaming.py index df464424fdba9bb6229f8c4f4e76e315bc2957fc..b5c864ea5a0a64e42372137955a01e4eebe652fa 100644 --- a/shared/workspaces/alembic/versions/91091612b6d0_mark4_workflow_renaming.py +++ b/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)