Merge branch 'limit-ngas-flag' into 'main'

implement ingestNGAS flag only on EB ingestion (VLBA/GMVA currently)

See merge request !1497

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

@@ -89,11 +89,26 @@ class IngestionManifest(ManifestComponentIF):
         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.ngas_ingest = self.get_ngas_flag()
 
         self.parameters = self.build_ingest_parameters(additional_metadata)
         self.files_found = [file for file in self.staging_source_dir.iterdir()]
 
+    def get_ngas_flag(self) -> bool:
+        """Determine and retrieve the correct ingestNGAS flag for this type of ingestion/curation"""
+
+        match self.sp_type:
+            case ScienceProductType.EXEC_BLOCK:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.observation")
+            case ScienceProductType.EVLA_CAL:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.calibration")
+            case ScienceProductType.IMAGE | ScienceProductType.VLASS_SECI:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.imaging")
+            case _:
+                flag = True
+
+        return flag
+
     def build_ingest_parameters(self, additional_metadata: AbstractTextFile):
         """
         Make the "parameters" section of the manifest

docker.properties

@@ -43,7 +43,9 @@ 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
+archive-ingestion.ingestNGAS.observation = true
+archive-ingestion.ingestNGAS.calibration = true
+archive-ingestion.ingestNGAS.imaging = true
 
 #
 # Standard Calibration Settings