Skip to content
Snippets Groups Projects
Commit ce5387b6 authored by Daniel Nemergut's avatar Daniel Nemergut
Browse files

Realized edu.nrao.archive.workflow.config.CasaVersions should be the casa package dir

parent be5ab77d
No related branches found
No related tags found
2 merge requests!1706merge 2.8.4 to main,!1670WS-1405 CASA matrix service
......@@ -32,9 +32,6 @@ logger = logging.getLogger(__name__)
Base = declarative_base()
# CASA's delivery directory
CASA_DELIVERY_DIR = "/home/casa/packages"
# Defined version number layouts for release:
RELEASE_CASA_REGEX = r"^casa-[0-9\.\-]*(pipeline-)?.*"
DEV_CASA_REGEX = r"^casa-[0-9\.\-]*(pipeline-)?[^tp]"
......@@ -87,7 +84,11 @@ class CasaMatrixService(CasaMatrixServiceIF):
self.router = Router("casa_matrix")
self.router.register(self)
# Used for linking and looking up default CASA versions
self.casa_delivery_dir = CapoConfig().get("edu.nrao.archive.workflow.config.CasaVersions")
self.casa_settings = CapoConfig().settings("edu.nrao.archive.workflow.config.CasaVersions")
# Used for linking and looking up linked CASA versions
self.archive_settings = CapoConfig().settings("edu.nrao.archive.archiveIface")
self.casa_root = self.archive_settings["casa_root"]
self.allow_dev_casa = True if self.archive_settings["allowDevCasaVersions"] == "true" else False
......@@ -349,7 +350,7 @@ class CasaMatrixService(CasaMatrixServiceIF):
temp_dir_name = CapoConfig().profile + "-new"
# Start with the RHEL* directories in the CASA delivery area
src_os_dirs = list(reversed(sorted([x for x in os.listdir(CASA_DELIVERY_DIR) if "RHEL" in x])))
src_os_dirs = list(reversed(sorted([x for x in os.listdir(self.casa_delivery_dir) if "RHEL" in x])))
for src_os_dir in src_os_dirs:
found_versions[src_os_dir] = []
......@@ -358,8 +359,8 @@ class CasaMatrixService(CasaMatrixServiceIF):
if not dry_run and not os.path.exists(dest_os_dir):
os.mkdir(dest_os_dir)
# casa_delivery / RHEL* / release
src_release_dir = os.path.join(CASA_DELIVERY_DIR, src_os_dir, "release")
# casa_delivery_dir / RHEL* / release
src_release_dir = os.path.join(self.casa_delivery_dir, src_os_dir, "release")
if os.path.isdir(src_release_dir):
for src_casa_dir in os.listdir(src_release_dir):
......
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