Revert "Setting the staging_area to the vlbiStagingDirectory for VLBA and GMVA ingestion"

This reverts commit 55931742.

apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingest.py

@@ -67,10 +67,7 @@ def _get_settings(
         parameters["workflowDir"] = pathlib.Path(source_dir).name
         parameters["seciCachePath"] = pathlib.Path(source_dir).parent
 
-    # Use the default staging area if it wasn't set by the solicitor
-    if not parameters["staging_area"]:
-        parameters["staging_area"] = ingestion_settings.stagingDirectory
-
+    parameters["staging_area"] = ingestion_settings.stagingDirectory
     parameters["storage_area"] = ingestion_settings.storageDirectory
     parameters["useIngest"] = strtobool(ingestion_settings.useIngest)
     parameters["workflowUrl"] = workflow_url

apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py

@@ -25,8 +25,7 @@ import pathlib
 from typing import List, Union
 
 import requests
-from ingest_envoy.utilities import IngestType, Telescope, VLASSIngestType
-from pycapo import CapoConfig
+from ingest_envoy.utilities import IngestType, VLASSIngestType
 
 INVALID_INITIAL_VERSION = "Initial version not valid for ingest"
 
@@ -218,14 +217,6 @@ class Solicitor:
             "project": self.metadata["projectMetadata"]["projectCode"],  # needed for post ingestion messaging
         }
 
-        # VLBA and GMVA share a non-default staging directory
-        if obs["telescope"].upper() in [Telescope.VLBA.value, Telescope.GMVA.value]:
-            try:
-                obs["staging_area"] = \
-                    CapoConfig().settings("edu.nrao.workspaces.IngestionSettings").vlbiStagingDirectory
-            except KeyError:
-                self.logger.info("Couldn't retrieve VLBI staging area from capo, using default staging directory")
-
         return {**obs}
 
     def solicit_seci_params(self) -> dict: