From 0551d76fb6ad74e38de35ada406e41c1acb614c7 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@orbi.tools>
Date: Mon, 12 Jul 2021 13:16:38 +0200
Subject: [PATCH] move settings to deadline

---
 .../plugins/publish/submit_maya_deadline.py    |  8 ++++----
 .../defaults/project_settings/deadline.json    | 14 ++++++++++----
 .../defaults/project_settings/maya.json        |  4 ----
 .../schema_project_deadline.json               | 10 ++++++++++
 .../schemas/schema_maya_publish.json           | 18 ------------------
 5 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
index c0c39a52b6..5cb6dbbd88 100644
--- a/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/openpype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -273,17 +273,17 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
         self._job_info = (
             context.data["project_settings"].get(
-                "maya", {}).get(
-                "publish", {}).get(
                 "deadline", {}).get(
+                "publish", {}).get(
+                "MayaSubmitDeadline", {}).get(
                 "jobInfo", {})
         )
 
         self._plugin_info = (
             context.data["project_settings"].get(
-                "maya", {}).get(
-                "publish", {}).get(
                 "deadline", {}).get(
+                "publish", {}).get(
+                "MayaSubmitDeadline", {}).get(
                 "pluginInfo", {})
         )
 
diff --git a/openpype/settings/defaults/project_settings/deadline.json b/openpype/settings/defaults/project_settings/deadline.json
index 5861015f2c..2dba20d63c 100644
--- a/openpype/settings/defaults/project_settings/deadline.json
+++ b/openpype/settings/defaults/project_settings/deadline.json
@@ -3,9 +3,13 @@
         "ValidateExpectedFiles": {
             "enabled": true,
             "active": true,
-            "families": ["render"],
-            "targets": ["deadline"],
-            "allow_user_override": true
+            "allow_user_override": true,
+            "families": [
+                "render"
+            ],
+            "targets": [
+                "deadline"
+            ]
         },
         "MayaSubmitDeadline": {
             "enabled": true,
@@ -15,7 +19,9 @@
             "use_published": true,
             "asset_dependencies": true,
             "group": "none",
-            "limit": []
+            "limit": [],
+            "jobInfo": {},
+            "pluginInfo": {}
         },
         "NukeSubmitDeadline": {
             "enabled": true,
diff --git a/openpype/settings/defaults/project_settings/maya.json b/openpype/settings/defaults/project_settings/maya.json
index 62d8a74670..284a1a0040 100644
--- a/openpype/settings/defaults/project_settings/maya.json
+++ b/openpype/settings/defaults/project_settings/maya.json
@@ -391,10 +391,6 @@
                 }
             }
         },
-        "deadline": {
-            "jobInfo": {},
-            "pluginInfo": {}
-        },
         "ExtractCameraAlembic": {
             "enabled": true,
             "optional": true,
diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index 3281c9ce4d..27eeaef559 100644
--- a/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/openpype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -108,6 +108,16 @@
                             "key": "limit",
                             "label": "Limit Groups",
                             "object_type": "text"
+                        },
+                        {
+                            "type": "raw-json",
+                            "key": "jobInfo",
+                            "label": "Additional JobInfo data"
+                        },
+                        {
+                            "type": "raw-json",
+                            "key": "pluginInfo",
+                            "label": "Additional PluginInfo data"
                         }
                     ]
                 },
diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
index 7e50682f5d..5ca7059ee5 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_maya_publish.json
@@ -309,24 +309,6 @@
             "type": "schema",
             "name": "schema_maya_capture"
         },
-        {
-            "type": "dict",
-            "collapsible": true,
-            "key": "deadline",
-            "label": "Additional Deadline Settings",
-            "children": [
-                {
-                    "type": "raw-json",
-                    "key": "jobInfo",
-                    "label": "Additional JobInfo data"
-                },
-                {
-                    "type": "raw-json",
-                    "key": "pluginInfo",
-                    "label": "Additional PluginInfo data"
-                }
-            ]
-        },
         {
             "type": "dict",
             "collapsible": true,