Merge branch 'refs/heads/master' into release_3

hubmapconsortium · Oct 25, 2024 · 2c954cb · 2c954cb
2 parents 543fbd7 + 204ce86
commit 2c954cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/ingest-pipeline/airflow/dags/azimuth_annotations.py b/src/ingest-pipeline/airflow/dags/azimuth_annotations.py
@@ -296,7 +296,7 @@ def build_cwltool_cmd4(**kwargs):
     )
 
     t_log_info = LogInfoOperator(task_id="log_info")
-    t_move_data = MoveDataOperator(task_id="move_data")
+    t_move_data = MoveDataOperator(task_id="move_data", tigger_rule="all_done")
     t_join = JoinOperator(task_id="join")
     t_create_tmpdir = CreateTmpDirOperator(task_id="create_tmpdir")
     t_cleanup_tmpdir = CleanupTmpDirOperator(task_id="cleanup_tmpdir")

diff --git a/src/ingest-pipeline/airflow/dags/utils.py b/src/ingest-pipeline/airflow/dags/utils.py
@@ -1266,6 +1266,8 @@ def get_cwltool_base_cmd(tmpdir: Path) -> List[str]:
 def build_provenance_function(cwl_workflows: List[Path]) -> Callable[..., List]:
     def build_provenance(**kwargs) -> List:
         dataset_uuid = get_previous_revision_uuid(**kwargs)
+        if dataset_uuid is None:
+            dataset_uuid = kwargs["dag_run"].conf.get("parent_submission_id", [None])[0]
         assert dataset_uuid is not None, "Missing previous_version_uuid"
 
         def my_callable(**kwargs):