Merge branch 'disable_ngas_ingest' into 'main'

Disable NGAS ingest via a capo setting

See merge request !1474

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

@@ -21,6 +21,7 @@ import logging
 import sys
 import tarfile
 from pathlib import Path
+from pycapo import CapoConfig
 
 # pylint: disable=C0301, E0401, R0903, R1721
 from typing import Tuple
@@ -87,6 +88,9 @@ class IngestionManifest(ManifestComponentIF):
         self.output_group = output_group
         self.telescope = telescope
 
+        # Check if NGAS ingestion should be enabled for all manifests in this environment
+        self.ngas_ingest = CapoConfig().getboolean("archive-ingestion.ingestNGAS")
+
         self.parameters = self.build_ingest_parameters(additional_metadata)
         self.files_found = [file for file in self.staging_source_dir.iterdir()]
 
@@ -108,7 +112,7 @@ class IngestionManifest(ManifestComponentIF):
             params = ManifestParameters(
                 telescope=self.telescope,
                 reingest=False,
-                ngas_ingest=True,
+                ngas_ingest=self.ngas_ingest,
                 calibrate=False,
                 staging_source_dir=self.staging_source_dir,
                 additional_metadata=additional_metadata,
@@ -118,7 +122,7 @@ class IngestionManifest(ManifestComponentIF):
             params = ManifestParameters(
                 telescope=self.telescope,
                 reingest=False,
-                ngas_ingest=True,
+                ngas_ingest=self.ngas_ingest,
                 calibrate=False,
                 staging_source_dir=self.staging_source_dir,
             )
@@ -127,7 +131,7 @@ class IngestionManifest(ManifestComponentIF):
             params = ManifestParameters(
                 telescope=self.telescope,
                 reingest=False,
-                ngas_ingest=True,
+                ngas_ingest=self.ngas_ingest,
                 staging_source_dir=self.staging_source_dir,
             )
 

docker.properties

@@ -43,6 +43,7 @@ edu.nrao.workspaces.VlassDeliverySettings.cache = /lustre/aoc/cluster/pipeline/v
 edu.nrao.workspaces.IngestionSettings.useIngest = False
 edu.nrao.workspaces.IngestionSettings.stagingDirectory = /lustre/aoc/cluster/pipeline/docker/workspaces/staging
 edu.nrao.workspaces.IngestionSettings.storageDirectory = /lustre/aoc/cluster/pipeline/docker/workspaces/storage
+archive-ingestion.ingestNGAS = true
 
 #
 # Standard Calibration Settings