From c0076058a00ca8e7b9c62c51ed25b0bbae03f022 Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@pype.club>
Date: Thu, 18 Mar 2021 11:51:39 +0100
Subject: [PATCH 1/2] add support for setting Deadline group and Limit Groups

---
 .../plugins/publish/submit_maya_deadline.py         | 13 +++++++++++--
 .../defaults/project_settings/deadline.json         |  4 +++-
 .../projects_schema/schema_project_deadline.json    | 11 +++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 55705d1bbb..4d5aec9d50 100644
--- a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -254,6 +254,8 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
     use_published = True
     tile_assembler_plugin = "PypeTileAssembler"
     asset_dependencies = False
+    limit_groups = []
+    group = "none"
 
     def process(self, instance):
         """Plugin entry point."""
@@ -402,8 +404,15 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         # Arbitrary username, for visualisation in Monitor
         self.payload_skeleton["JobInfo"]["UserName"] = deadline_user
         # Set job priority
-        self.payload_skeleton["JobInfo"]["Priority"] = self._instance.data.get(
-            "priority", 50)
+        self.payload_skeleton["JobInfo"]["Priority"] = \
+            self._instance.data.get("priority", 50)
+
+        if self.group != "none":
+            self.payload_skeleton["JobInfo"]["Group"] = self.group
+
+        if self.limit:
+            self.payload_skeleton["JobInfo"]["LimitGroups"] = \
+                ",".join(self.limit)
         # Optional, enable double-click to preview rendered
         # frames from Deadline Monitor
         self.payload_skeleton["JobInfo"]["OutputDirectory0"] = \
diff --git a/pype/settings/defaults/project_settings/deadline.json b/pype/settings/defaults/project_settings/deadline.json
index 9e5665bee9..892fb5d29f 100644
--- a/pype/settings/defaults/project_settings/deadline.json
+++ b/pype/settings/defaults/project_settings/deadline.json
@@ -5,7 +5,9 @@
             "optional": false,
             "tile_assembler_plugin": "oiio",
             "use_published": true,
-            "asset_dependencies": true
+            "asset_dependencies": true,
+            "group": "none",
+            "limit": []
         },
         "NukeSubmitDeadline": {
             "enabled": true,
diff --git a/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json b/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
index c103f9467c..97b2805959 100644
--- a/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
+++ b/pype/settings/entities/schemas/projects_schema/schema_project_deadline.json
@@ -52,6 +52,17 @@
                             "type": "boolean",
                             "key": "asset_dependencies",
                             "label": "Use Asset dependencies"
+                        },
+                        {
+                            "type": "text",
+                            "key": "group",
+                            "label": "Group Name"
+                        },
+                        {
+                            "type": "list",
+                            "key": "limit",
+                            "label": "Limit Groups",
+                            "object_type": "text"
                         }
                     ]
                 },

From 30481e952991e6860796205b6fe81ab339ffa88b Mon Sep 17 00:00:00 2001
From: Ondrej Samohel <ondrej.samohel@pype.club>
Date: Thu, 18 Mar 2021 17:54:05 +0100
Subject: [PATCH 2/2] fix typos

---
 pype/modules/deadline/plugins/publish/submit_maya_deadline.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
index 4d5aec9d50..b17dd6ba8d 100644
--- a/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
+++ b/pype/modules/deadline/plugins/publish/submit_maya_deadline.py
@@ -410,9 +410,9 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         if self.group != "none":
             self.payload_skeleton["JobInfo"]["Group"] = self.group
 
-        if self.limit:
+        if self.limit_groups:
             self.payload_skeleton["JobInfo"]["LimitGroups"] = \
-                ",".join(self.limit)
+                ",".join(self.limit_groups)
         # Optional, enable double-click to preview rendered
         # frames from Deadline Monitor
         self.payload_skeleton["JobInfo"]["OutputDirectory0"] = \