Merge pull request #6263 from ynput/bugfix/AY-5022_Deadline-Submit-Pu…

…blish-job-error Deadline: Submit Publish job error
ynput · Apr 16, 2024 · 0083c73 · 0083c73
2 parents 25fa7a9 + 8b31020
commit 0083c73
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_remote_publish_deadline.py
@@ -108,7 +108,6 @@ def get_job_info(self):
                             if key in os.environ}, **legacy_io.Session)
 
         # TODO replace legacy_io with context.data
-        environment["AVALON_DB"] = os.environ.get("AVALON_DB")
         environment["AVALON_PROJECT"] = project_name
         environment["AVALON_ASSET"] = instance.context.data["asset"]
         environment["AVALON_TASK"] = instance.context.data["task"]
@@ -122,6 +121,7 @@ def get_job_info(self):
             environment["AYON_REMOTE_PUBLISH"] = "1"
         else:
             environment["OPENPYPE_REMOTE_PUBLISH"] = "1"
+            environment["AVALON_DB"] = os.environ.get("AVALON_DB")
         for key, value in environment.items():
             job_info.EnvironmentKeyValue[key] = value
 

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_cache_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_cache_job.py
@@ -131,7 +131,6 @@ def _submit_deadline_post_job(self, instance, job):
             create_metadata_path(instance, anatomy)
 
         environment = {
-            "AVALON_DB": os.environ["AVALON_DB"],
             "AVALON_PROJECT": instance.context.data["projectName"],
             "AVALON_ASSET": instance.context.data["asset"],
             "AVALON_TASK": instance.context.data["task"],
@@ -147,6 +146,7 @@ def _submit_deadline_post_job(self, instance, job):
             environment["AYON_BUNDLE_NAME"] = os.environ["AYON_BUNDLE_NAME"]
             deadline_plugin = "Ayon"
         else:
+            environment["AVALON_DB"] = os.environ["AVALON_DB"]
             environment["OPENPYPE_PUBLISH_JOB"] = "1"
             environment["OPENPYPE_RENDER_JOB"] = "0"
             environment["OPENPYPE_REMOTE_PUBLISH"] = "0"

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -187,7 +187,6 @@ def _submit_deadline_post_job(self, instance, job, instances):
             create_metadata_path(instance, anatomy)
 
         environment = {
-            "AVALON_DB": os.environ["AVALON_DB"],
             "AVALON_PROJECT": instance.context.data["projectName"],
             "AVALON_ASSET": instance.context.data["asset"],
             "AVALON_TASK": instance.context.data["task"],
@@ -203,6 +202,7 @@ def _submit_deadline_post_job(self, instance, job, instances):
             environment["AYON_BUNDLE_NAME"] = os.environ["AYON_BUNDLE_NAME"]
             deadline_plugin = "Ayon"
         else:
+            environment["AVALON_DB"] = os.environ["AVALON_DB"]
             environment["OPENPYPE_PUBLISH_JOB"] = "1"
             environment["OPENPYPE_RENDER_JOB"] = "0"
             environment["OPENPYPE_REMOTE_PUBLISH"] = "0"