Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Chore: remove Muster #6085

Merged
merged 3 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions openpype/lib/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ def requests_post(*args, **kwargs):
"""Wrap request post method.

Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
variable is found. This is useful when Deadline or Muster server are
running with self-signed certificates and their certificate is not
variable is found. This is useful when Deadline server is
running with self-signed certificates and its certificate is not
added to trusted certificates on client machines.

Warning:
Disabling SSL certificate validation is defeating one line
of defense SSL is providing and it is not recommended.
of defense SSL is providing, and it is not recommended.

"""
if "verify" not in kwargs:
Expand All @@ -24,13 +24,13 @@ def requests_get(*args, **kwargs):
"""Wrap request get method.

Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
variable is found. This is useful when Deadline or Muster server are
running with self-signed certificates and their certificate is not
variable is found. This is useful when Deadline server is
running with self-signed certificates and its certificate is not
added to trusted certificates on client machines.

Warning:
Disabling SSL certificate validation is defeating one line
of defense SSL is providing and it is not recommended.
of defense SSL is providing, and it is not recommended.

"""
if "verify" not in kwargs:
Expand Down
1 change: 0 additions & 1 deletion openpype/modules/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1332,7 +1332,6 @@ class TrayModulesManager(ModulesManager):
"user",
"ftrack",
"kitsu",
"muster",
"launcher_tool",
"avalon",
"clockify",
Expand Down
8 changes: 4 additions & 4 deletions openpype/modules/deadline/abstract_submit_deadline.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ def requests_post(*args, **kwargs):
"""Wrap request post method.

Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
variable is found. This is useful when Deadline or Muster server are
running with self-signed certificates and their certificate is not
variable is found. This is useful when Deadline server is
running with self-signed certificates and its certificate is not
added to trusted certificates on client machines.

Warning:
Expand All @@ -55,8 +55,8 @@ def requests_get(*args, **kwargs):
"""Wrap request get method.

Disabling SSL certificate validation if ``DONT_VERIFY_SSL`` environment
variable is found. This is useful when Deadline or Muster server are
running with self-signed certificates and their certificate is not
variable is found. This is useful when Deadline server is
running with self-signed certificates and its certificate is not
added to trusted certificates on client machines.

Warning:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,6 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin,
def _submit_deadline_post_job(self, instance, job):
"""Submit publish job to Deadline.

Deadline specific code separated from :meth:`process` for sake of
more universal code. Muster post job is sent directly by Muster
submitter, so this type of code isn't necessary for it.

Returns:
(str): deadline_publish_job_id
"""
Expand Down
65 changes: 17 additions & 48 deletions openpype/modules/deadline/plugins/publish/submit_publish_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,15 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
publish.ColormanagedPyblishPluginMixin):
"""Process Job submitted on farm.

These jobs are dependent on a deadline or muster job
These jobs are dependent on a deadline job
submission prior to this plug-in.

- In case of Deadline, it creates dependent job on farm publishing
rendered image sequence.

- In case of Muster, there is no need for such thing as dependent job,
post action will be executed and rendered sequence will be published.
It creates dependent job on farm publishing rendered image sequence.

Options in instance.data:
- deadlineSubmissionJob (dict, Required): The returned .json
data from the job submission to deadline.

- musterSubmissionJob (dict, Required): same as deadline.

- outputDir (str, Required): The output directory where the metadata
file should be generated. It's assumed that this will also be
final folder containing the output files.
Expand All @@ -89,7 +83,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,

"""

label = "Submit image sequence jobs to Deadline or Muster"
label = "Submit image sequence jobs to Deadline"
order = pyblish.api.IntegratorOrder + 0.2
icon = "tractor"

Expand Down Expand Up @@ -161,10 +155,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin,
def _submit_deadline_post_job(self, instance, job, instances):
"""Submit publish job to Deadline.

Deadline specific code separated from :meth:`process` for sake of
more universal code. Muster post job is sent directly by Muster
submitter, so this type of code isn't necessary for it.

Returns:
(str): deadline_publish_job_id
"""
Expand Down Expand Up @@ -581,21 +571,11 @@ def process(self, instance):
._____.

'''

render_job = None
submission_type = ""
if instance.data.get("toBeRenderedOn") == "deadline":
render_job = instance.data.pop("deadlineSubmissionJob", None)
submission_type = "deadline"

if instance.data.get("toBeRenderedOn") == "muster":
render_job = instance.data.pop("musterSubmissionJob", None)
submission_type = "muster"
render_job = instance.data.pop("deadlineSubmissionJob", None)

if not render_job and instance.data.get("tileRendering") is False:
raise AssertionError(("Cannot continue without valid Deadline "
"or Muster submission."))

raise AssertionError(("Cannot continue without valid "
"Deadline submission."))
if not render_job:
import getpass

Expand Down Expand Up @@ -624,21 +604,19 @@ def process(self, instance):
"FTRACK_SERVER": os.environ.get("FTRACK_SERVER"),
}

deadline_publish_job_id = None
if submission_type == "deadline":
# get default deadline webservice url from deadline module
self.deadline_url = instance.context.data["defaultDeadline"]
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
self.deadline_url = instance.data.get("deadlineUrl")
assert self.deadline_url, "Requires Deadline Webservice URL"
# get default deadline webservice url from deadline module
self.deadline_url = instance.context.data["defaultDeadline"]
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
self.deadline_url = instance.data.get("deadlineUrl")
assert self.deadline_url, "Requires Deadline Webservice URL"

deadline_publish_job_id = \
self._submit_deadline_post_job(instance, render_job, instances)
deadline_publish_job_id = \
self._submit_deadline_post_job(instance, render_job, instances)

# Inject deadline url to instances.
for inst in instances:
inst["deadlineUrl"] = self.deadline_url
# Inject deadline url to instances.
for inst in instances:
inst["deadlineUrl"] = self.deadline_url

# publish job file
publish_job = {
Expand All @@ -664,15 +642,6 @@ def process(self, instance):
if audio_file and os.path.isfile(audio_file):
publish_job.update({"audio": audio_file})

# pass Ftrack credentials in case of Muster
if submission_type == "muster":
ftrack = {
"FTRACK_API_USER": os.environ.get("FTRACK_API_USER"),
"FTRACK_API_KEY": os.environ.get("FTRACK_API_KEY"),
"FTRACK_SERVER": os.environ.get("FTRACK_SERVER"),
}
publish_job.update({"ftrack": ftrack})

metadata_path, rootless_metadata_path = \
create_metadata_path(instance, anatomy)

Expand Down
6 changes: 0 additions & 6 deletions openpype/modules/muster/__init__.py

This file was deleted.

147 changes: 0 additions & 147 deletions openpype/modules/muster/muster.py

This file was deleted.

Loading