Testing: Release Maya/Deadline job from pending when testing. (#5988)

* Release job from pending when testing. * Removed render instance This test was created as simple model and workfile publish, without Deadline rendering. Cleaned up render elements. * Revert changes in submit publish plugin --------- Co-authored-by: kalisp <[email protected]>
ynput · Jan 3, 2024 · e4e6503 · e4e6503
1 parent c62ede3
commit e4e6503
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -231,7 +231,7 @@ def get_job_info(self):
         job_info.EnvironmentKeyValue["OPENPYPE_LOG_NO_COLORS"] = "1"
 
         # Adding file dependencies.
-        if self.asset_dependencies:
+        if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies:
             dependencies = instance.context.data["fileDependencies"]
             for dependency in dependencies:
                 job_info.AssetDependency += dependency
@@ -570,7 +570,7 @@ def _get_maya_payload(self, data):
 
         job_info = copy.deepcopy(self.job_info)
 
-        if self.asset_dependencies:
+        if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies:
             # Asset dependency to wait for at least the scene file to sync.
             job_info.AssetDependency += self.scene_path
 

diff --git a/openpype/modules/deadline/plugins/publish/submit_publish_job.py b/openpype/modules/deadline/plugins/publish/submit_publish_job.py
@@ -297,7 +297,9 @@ def _submit_deadline_post_job(self, instance, job, instances):
                     job_index)] = assembly_id  # noqa: E501
                 job_index += 1
         elif instance.data.get("bakingSubmissionJobs"):
-            self.log.info("Adding baking submission jobs as dependencies...")
+            self.log.info(
+                "Adding baking submission jobs as dependencies..."
+            )
             job_index = 0
             for assembly_id in instance.data["bakingSubmissionJobs"]:
                 payload["JobInfo"]["JobDependency{}".format(

diff --git a/...expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma b/...expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v001.ma
@@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
 	addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
 	addAttr -ci true -sn "task" -ln "task" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".hio" yes;

diff --git a/...expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma b/...expected/test_project/test_asset/work/test_task/test_project_test_asset_test_task_v002.ma
@@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
 	addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
 	addAttr -ci true -sn "task" -ln "task" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".hio" yes;

diff --git a/.../hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma b/.../hosts/maya/test_publish_in_maya/input/workfile/test_project_test_asset_test_task_v001.ma
@@ -185,7 +185,7 @@ createNode objectSet -n "modelMain";
 	addAttr -ci true -sn "attrPrefix" -ln "attrPrefix" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".cbId" -type "string" "60df31e2be2b48bd3695c056:7364ea6776c9";
@@ -296,7 +296,7 @@ createNode objectSet -n "workfileMain";
 	addAttr -ci true -sn "task" -ln "task" -dt "string";
 	addAttr -ci true -sn "publish_attributes" -ln "publish_attributes" -dt "string";
 	addAttr -ci true -sn "creator_attributes" -ln "creator_attributes" -dt "string";
-	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys" 
+	addAttr -ci true -sn "__creator_attributes_keys" -ln "__creator_attributes_keys"
 		-dt "string";
 	setAttr ".ihi" 0;
 	setAttr ".hio" yes;