Skip to content
Snippets Groups Projects
Commit 3011f760 authored by Nathan Hertz's avatar Nathan Hertz
Browse files

Small dev environment fixes

parent 1d67d8cb
No related branches found
No related tags found
1 merge request!245Small dev environment fixes
Pipeline #1692 waiting for manual action
......@@ -16,3 +16,6 @@ JOB_DEFAULT_NOTIFICATION = ERROR
# Differentiate from other pools if needed
PoolName = "testpost"
# Set UID domain
UID_DOMAIN = aoc.nrao.edu
......@@ -31,6 +31,7 @@ services:
- /lustre/aoc/cluster/pipeline/dsoc-dev/downloads/nrao:/lustre/aoc/cluster/pipeline/dsoc-dev/downloads/nrao
- /lustre/aoc/cluster/pipeline/dsoc-dev/workspaces:/lustre/aoc/cluster/pipeline/dsoc-dev/workspaces
- /home/ssa/bin/python3.8:/home/ssa/bin/python3.8
- /home/casa/capo:/home/casa/capo
capability:
image: marconi.aoc.nrao.edu/workspaces/capability:${TAG}
......
"""add CAPO_PATH env var to download and calibration
Revision ID: c4001510507c
Revises: 2b6e18877c8e
Create Date: 2021-05-21 10:02:03.013963
"""
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = "c4001510507c"
down_revision = "2b6e18877c8e"
branch_labels = None
depends_on = None
def upgrade():
submit_file_content = """executable = test_download.sh
arguments = {{product_locator}} {{request_id}}
output = test_download.out
error = test_download.err
log = test_download.log
SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
should_transfer_files = yes
transfer_input_files = $(SBIN_PATH)/productfetcher, $(SBIN_PATH)/deliver
getenv = True
environment = "CAPO_PATH=/home/casa/capo"
queue
"""
op.execute(
"UPDATE workflow_templates "
f"SET content = E'{submit_file_content}' "
"WHERE filename = 'test_download.condor'"
)
submit_file_contents = """executable = std_calibration.sh
arguments = {{product_locator}} {{request_id}} metadata.json PPR.xml
output = calibration.out
error = calibration.err
log = condor.log
SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
should_transfer_files = yes
transfer_input_files = $(SBIN_PATH)/framework.sh, $(SBIN_PATH)/productfetcher, $(SBIN_PATH)/casa_envoy, $(SBIN_PATH)/deliver-cipl.sh, ./PPR.xml, ./metadata.json
getenv = True
environment = "CAPO_PATH=/home/casa/capo"
queue
"""
op.execute(
f"UPDATE workflow_templates SET content = E'{submit_file_contents}' WHERE filename = 'std_calibration.condor'"
)
def downgrade():
submit_file_content = """executable = test_download.sh
arguments = {{product_locator}} {{request_id}}
output = test_download.out
error = test_download.err
log = test_download.log
SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
should_transfer_files = yes
transfer_input_files = $(SBIN_PATH)/productfetcher, $(SBIN_PATH)/deliver
getenv = True
queue
"""
op.execute(
"UPDATE workflow_templates "
f"SET content = E'{submit_file_content}' "
"WHERE filename = 'test_download.condor'"
)
submit_file_contents = """executable = std_calibration.sh
arguments = {{product_locator}} {{request_id}} metadata.json PPR.xml
output = calibration.out
error = calibration.err
log = condor.log
SBIN_PATH = /lustre/aoc/cluster/pipeline/$ENV(CAPO_PROFILE)/workspaces/sbin
should_transfer_files = yes
transfer_input_files = $(SBIN_PATH)/framework.sh, $(SBIN_PATH)/productfetcher, $(SBIN_PATH)/casa_envoy, $(SBIN_PATH)/deliver-cipl.sh
getenv = True
queue
"""
op.execute(
f"UPDATE workflow_templates SET content = E'{submit_file_contents}' WHERE filename = 'std_calibration.condor'"
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment