change the way job farm type is determined

pype/plugins/celaction/publish/submit_celaction_deadline.py

@@ -34,6 +34,7 @@ class ExtractCelactionDeadline(pyblish.api.InstancePlugin):
     ]
 
     def process(self, instance):
+        instance.data["toBeRenderedOn"] = "deadline"
         context = instance.context
 
         DEADLINE_REST_URL = os.environ.get("DEADLINE_REST_URL")

pype/plugins/fusion/publish/submit_deadline.py

@@ -22,7 +22,7 @@ class FusionSubmitDeadline(pyblish.api.InstancePlugin):
     families = ["saver.deadline"]
 
     def process(self, instance):
-
+        instance.data["toBeRenderedOn"] = "deadline"
         context = instance.context
 
         key = "__hasRun{}".format(self.__class__.__name__)

pype/plugins/global/publish/submit_publish_job.py

@@ -855,17 +855,17 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin):
 
         '''
 
-        render_job = data.pop("deadlineSubmissionJob", None)
-        submission_type = "deadline"
-        if not render_job:
-            # No deadline job. Try Muster: musterSubmissionJob
+        if instance.data.get("toBeRenderedOn") == "deadline":
+            render_job = data.pop("deadlineSubmissionJob", None)
+            submission_type = "deadline"
+
+        if instance.data.get("toBeRenderedOn") == "muster":
             render_job = data.pop("musterSubmissionJob", None)
             submission_type = "muster"
-            assert render_job or instance.data.get("tileRendering") is False, (
-                "Can't continue without valid Deadline "
-                "or Muster submission prior to this "
-                "plug-in."
-            )
+
+        if not render_job and instance.data.get("tileRendering") is False:
+            raise AssertionError(("Cannot continue without valid Deadline "
+                                  "or Muster submission."))
 
         if submission_type == "deadline":
             self.DEADLINE_REST_URL = os.environ.get(

pype/plugins/maya/publish/collect_render.py

@@ -242,6 +242,7 @@ class CollectMayaRender(pyblish.api.ContextPlugin):
                 "resolutionWidth": cmds.getAttr("defaultResolution.width"),
                 "resolutionHeight": cmds.getAttr("defaultResolution.height"),
                 "pixelAspect": cmds.getAttr("defaultResolution.pixelAspect"),
+                "tileRendering": render_instance.data.get("tileRendering") or False  # noqa: E501
             }
 
             # Apply each user defined attribute as data

pype/plugins/maya/publish/submit_maya_deadline.py

@@ -20,6 +20,7 @@ import os
 import json
 import getpass
 import copy
+import re
 
 import clique
 import requests
@@ -85,7 +86,8 @@ def get_renderer_variables(renderlayer, root):
         gin="#" * int(padding),
         lut=True,
         layer=renderlayer or lib.get_current_renderlayer())[0]
-    filename_0 = filename_0.replace('_<RenderPass>', '_beauty')
+    filename_0 = re.sub('_<RenderPass>', '_beauty',
+                        filename_0, flags=re.IGNORECASE)
     prefix_attr = "defaultRenderGlobals.imageFilePrefix"
     if renderer == "vray":
         renderlayer = renderlayer.split("_")[-1]
@@ -108,8 +110,8 @@ def get_renderer_variables(renderlayer, root):
         # does not work for vray.
         scene = cmds.file(query=True, sceneName=True)
         scene, _ = os.path.splitext(os.path.basename(scene))
-        filename_0 = filename_prefix.replace('<Scene>', scene)
-        filename_0 = filename_0.replace('<Layer>', renderlayer)
+        filename_0 = re.sub('<Scene>', scene, filename_prefix, flags=re.IGNORECASE)  # noqa: E501
+        filename_0 = re.sub('<Layer>', renderlayer, filename_0, flags=re.IGNORECASE)  # noqa: E501
         filename_0 = "{}.{}.{}".format(
             filename_0, "#" * int(padding), extension)
         filename_0 = os.path.normpath(os.path.join(root, filename_0))
@@ -164,6 +166,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
 
     def process(self, instance):
         """Plugin entry point."""
+        instance.data["toBeRenderedOn"] = "deadline"
         self._instance = instance
         self._deadline_url = os.environ.get(
             "DEADLINE_REST_URL", "http://localhost:8082")
@@ -172,6 +175,7 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
         context = instance.context
         workspace = context.data["workspaceDir"]
         anatomy = context.data['anatomy']
+        instance.data["toBeRenderedOn"] = "deadline"
 
         filepath = None
 
@@ -402,6 +406,8 @@ class MayaSubmitDeadline(pyblish.api.InstancePlugin):
             if not response.ok:
                 raise Exception(response.text)
             instance.data["deadlineSubmissionJob"] = response.json()
+        else:
+            self.log.info("Skipping submission, tile rendering enabled.")
 
         # Store output dir for unified publisher (filesequence)
         instance.data["outputDir"] = os.path.dirname(output_filename_0)

pype/plugins/maya/publish/submit_maya_muster.py

@@ -249,6 +249,7 @@ class MayaSubmitMuster(pyblish.api.InstancePlugin):
         Authenticate with Muster, collect all data, prepare path for post
         render publish job and submit job to farm.
         """
+        instance.data["toBeRenderedOn"] = "muster"
         # setup muster environment
         self.MUSTER_REST_URL = os.environ.get("MUSTER_REST_URL")
 

pype/plugins/nuke/publish/submit_nuke_deadline.py

@@ -28,6 +28,7 @@ class NukeSubmitDeadline(pyblish.api.InstancePlugin):
     deadline_chunk_size = 1
 
     def process(self, instance):
+        instance.data["toBeRenderedOn"] = "deadline"
         families = instance.data["families"]
 
         node = instance[0]