Merge branch 'release/3.15.x' into feature/OP-3845_nuke-convert-to-new-publisher

This commit is contained in:
Jakub Trllo 2022-12-20 15:24:22 +01:00
commit b4d29d0160
27 changed files with 573 additions and 77 deletions

View file

@ -188,7 +188,6 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
# Adding file dependencies.
if self.asset_dependencies:
dependencies = instance.context.data["fileDependencies"]
dependencies.append(context.data["currentFile"])
for dependency in dependencies:
job_info.AssetDependency += dependency
@ -299,7 +298,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
# Add export job as dependency --------------------------------------
if export_job:
job_info, _ = payload
job_info.JobDependency = export_job
job_info.JobDependencies = export_job
if instance.data.get("tileRendering"):
# Prepare tiles data
@ -436,7 +435,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline):
frame_assembly_job_info.ExtraInfo[0] = file_hash
frame_assembly_job_info.ExtraInfo[1] = file
frame_assembly_job_info.JobDependency = tile_job_id
frame_assembly_job_info.JobDependencies = tile_job_id
# write assembly job config files
now = datetime.now()