From 5f9d9b6ef4160653505d80ca4a190c9b71f553fe Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Tue, 6 Jul 2021 16:46:17 -0600
Subject: [PATCH] WS-508: templates for calibration ingestion workflow
---
...2b4e_add_calibration_ingestion_workflow.py | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/schema/versions/e99b65ee2b4e_add_calibration_ingestion_workflow.py b/schema/versions/e99b65ee2b4e_add_calibration_ingestion_workflow.py
index 60352ebae..bdd52ff30 100644
--- a/schema/versions/e99b65ee2b4e_add_calibration_ingestion_workflow.py
+++ b/schema/versions/e99b65ee2b4e_add_calibration_ingestion_workflow.py
@@ -17,7 +17,7 @@ depends_on = None
condor_content = """executable = ingest_cal.sh
-arguments = {{request_id}} metadata.json
+arguments = metadata.json
output = ingest.out
error = ingest.err
@@ -25,7 +25,7 @@ log = condor.log
SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
should_transfer_files = yes
-transfer_input_files = $(SBIN_PATH)/conveyor, $(SBIN_PATH)/ingest_envoy ./metadata.json
+transfer_input_files = $(SBIN_PATH)/conveyor, $(SBIN_PATH)/ingest_envoy, $(SBIN_PATH)/calibration-table-collector.sh, ./metadata.json
getenv = True
environment = "CAPO_PATH=/home/casa/capo"
@@ -35,9 +35,9 @@ queue
script_content = """#!/bin/sh
set -o errexit
-chmod 770 .
-./conveyor --retrieve $2
-./ingest_envoy
+
+./conveyor --retrieve $1
+./ingest_envoy --ingest-cal $1
"""
@@ -65,4 +65,14 @@ def upgrade():
def downgrade():
- pass
+ op.execute(
+ """
+ DELETE FROM workflows WHERE workflow_name='ingest-cal'
+ """
+ )
+
+ op.execute(
+ """
+ DELETE FROM workflow_templates WHERE workflow_name='ingest-cal'
+ """
+ )
--
GitLab