Skip to content
Snippets Groups Projects
Commit 4857f079 authored by Sam Kagan's avatar Sam Kagan
Browse files

Merge branch 'fix-local-vela-pf' into 'main'

Fixed minor hiccups in running std_cal locally

See merge request !1464
parents 4105d4fd 414ff7a5
No related branches found
No related tags found
1 merge request!1464Fixed minor hiccups in running std_cal locally
Pipeline #12227 passed
...@@ -20,16 +20,15 @@ import json ...@@ -20,16 +20,15 @@ import json
import logging import logging
import os import os
import pathlib import pathlib
import re
import subprocess import subprocess
import sys import sys
from typing import Dict, Union from typing import Dict, Union
import re
from casa_envoy.auditor import AuditDirectories, AuditFiles from casa_envoy.auditor import AuditDirectories, AuditFiles
from casa_envoy.configure import CasaConfigure, ParallelRunner, StandardRunner
from casa_envoy.enums import ProductType from casa_envoy.enums import ProductType
from casa_envoy.foundation import RestoreFoundation, GeneralFoundation, CubeFoundation from casa_envoy.foundation import CubeFoundation, GeneralFoundation, RestoreFoundation
from casa_envoy.configure import StandardRunner, ParallelRunner, CasaConfigure
from casa_envoy.interfaces import LauncherIF from casa_envoy.interfaces import LauncherIF
from casa_envoy.schema import AbstractTextFile from casa_envoy.schema import AbstractTextFile
...@@ -98,7 +97,7 @@ class CasaLauncher: ...@@ -98,7 +97,7 @@ class CasaLauncher:
# directly from the processing directory. Account for both cases # directly from the processing directory. Account for both cases
vela_path = ( vela_path = (
"./vela" "./vela"
if pathlib.Path("./vela").exists() if (pathlib.Path.cwd() / "vela").exists()
else f"/lustre/aoc/cluster/pipeline/{os.environ.get('CAPO_PROFILE')}/workspaces/sbin/vela" else f"/lustre/aoc/cluster/pipeline/{os.environ.get('CAPO_PROFILE')}/workspaces/sbin/vela"
) )
subprocess.run([vela_path, "-f", metadata, ppr, "--" + run_type]) subprocess.run([vela_path, "-f", metadata, ppr, "--" + run_type])
......
...@@ -65,7 +65,7 @@ edu.nrao.workspaces.DeliverySettings.standardImageDelivery = /lustre/aoc/cluster ...@@ -65,7 +65,7 @@ edu.nrao.workspaces.DeliverySettings.standardImageDelivery = /lustre/aoc/cluster
# #
edu.nrao.workspaces.ProductFetcherSettings.locatorServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/location?locator edu.nrao.workspaces.ProductFetcherSettings.locatorServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/location?locator
edu.nrao.workspaces.ProductFetcherSettings.metadataServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/product/metadata edu.nrao.workspaces.ProductFetcherSettings.metadataServiceUrlPrefix = https://webtest.aoc.nrao.edu/archive-service/product/metadata
edu.nrao.workspaces.ProductFetcherSettings.defaultThreadsPerHost = 4 edu.nrao.workspaces.ProductFetcherSettings.defaultThreadsPerHost = 1
edu.nrao.workspaces.ProductFetcherSettings.executionSite = local_test edu.nrao.workspaces.ProductFetcherSettings.executionSite = local_test
# #
......
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