Merge pull request #36 from ynput/bugfix/staging-job-fix

Publish jobs respect staging mode
ynput · Sep 25, 2024 · a831b40 · a831b40
2 parents 0d8d3b1 + 120c616
commit a831b40
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py
@@ -196,6 +196,7 @@ def _submit_deadline_post_job(self, instance, job, instances):
         metadata_path, rootless_metadata_path = \
             create_metadata_path(instance, anatomy)
 
+        settings_variant = os.environ["AYON_DEFAULT_SETTINGS_VARIANT"]
         environment = {
             "AYON_PROJECT_NAME": instance.context.data["projectName"],
             "AYON_FOLDER_PATH": instance.context.data["folderPath"],
@@ -207,9 +208,7 @@ def _submit_deadline_post_job(self, instance, job, instances):
             "AYON_RENDER_JOB": "0",
             "AYON_REMOTE_PUBLISH": "0",
             "AYON_BUNDLE_NAME": os.environ["AYON_BUNDLE_NAME"],
-            "AYON_DEFAULT_SETTINGS_VARIANT": (
-                os.environ["AYON_DEFAULT_SETTINGS_VARIANT"]
-            ),
+            "AYON_DEFAULT_SETTINGS_VARIANT": settings_variant,
         }
 
         # add environments from self.environ_keys
@@ -227,8 +226,12 @@ def _submit_deadline_post_job(self, instance, job, instances):
             'publish',
             '"{}"'.format(rootless_metadata_path),
             "--targets", "deadline",
-            "--targets", "farm"
+            "--targets", "farm",
         ]
+        # TODO remove when AYON launcher respects environment variable
+        #   'AYON_DEFAULT_SETTINGS_VARIANT'
+        if settings_variant == "staging":
+            args.append("--use-staging")
 
         # Generate the payload for Deadline submission
         secondary_pool = (