From 2a8447ba6fe90bebc2422a38369a317881a014a3 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:48:07 +0100 Subject: [PATCH 1/6] respect 'AYON_USE_STAGING' --- .../repository/custom/plugins/GlobalJobPreLoad.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index 99f02eb3db..29cbef45bc 100644 --- a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -583,9 +583,11 @@ def inject_ayon_environment(deadlinePlugin): "AYON_BUNDLE_NAME": ayon_bundle_name, } - automatic_tests = job.GetJobEnvironmentKeyValue("AYON_IN_TESTS") - if automatic_tests: - environment["AYON_IN_TESTS"] = automatic_tests + for key in ("AYON_USE_STAGING", "AYON_IN_TESTS"): + value = job.GetJobEnvironmentKeyValue(key) + if value: + environment[key] = value + for env, val in environment.items(): # Add the env var for the Render Plugin that is about to render deadlinePlugin.SetEnvironmentVariable(env, val) From ba7d0b266e5fe94709daba14375f420e00f0f0e9 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:48:18 +0100 Subject: [PATCH 2/6] change note for 'AYON_DEFAULT_SETTINGS_VARIANT' --- .../repository/custom/plugins/GlobalJobPreLoad.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index 29cbef45bc..312283db03 100644 --- a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -558,8 +558,12 @@ def inject_ayon_environment(deadlinePlugin): ] # staging requires passing argument - # TODO could be switched to env var after https://github.com/ynput/ayon-launcher/issues/123 - settings_variant = job.GetJobEnvironmentKeyValue("AYON_DEFAULT_SETTINGS_VARIANT") # noqa + # TODO could be removed when PR in ayon-core starts to fill + # 'AYON_USE_STAGING' (https://github.com/ynput/ayon-core/pull/1130) + # - add requirement for "core>=1.1.1" to 'package.py' when removed + settings_variant = job.GetJobEnvironmentKeyValue( + "AYON_DEFAULT_SETTINGS_VARIANT" + ) if settings_variant == "staging": args.append("--use-staging") From 0b22f482c22e6b5b11dc6effd8d518ff336a77da Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:48:26 +0100 Subject: [PATCH 3/6] bump plugin version --- .../ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index 312283db03..e2002ff70a 100644 --- a/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -13,7 +13,7 @@ FileUtils, DirectoryUtils, ) -__version__ = "1.2.0" +__version__ = "1.2.1" VERSION_REGEX = re.compile( r"(?P0|[1-9]\d*)" r"\.(?P0|[1-9]\d*)" From 4658b23c8a8d414164674711c9f1b9462f32a3be Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:50:32 +0100 Subject: [PATCH 4/6] make sure 'AYON_DEFAULT_SETTINGS_VARIANT' is set up --- .../ayon_deadline/plugins/publish/global/submit_publish_job.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py index 82f4e0348c..0da3d442f4 100644 --- a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py +++ b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py @@ -202,6 +202,9 @@ def _submit_deadline_post_job( # TODO remove when AYON launcher respects environment variable # 'AYON_DEFAULT_SETTINGS_VARIANT' settings_variant = os.environ["AYON_DEFAULT_SETTINGS_VARIANT"] + # NOTE is removed from ayon-core, but still required by + # GlobalPreLoadJob.py + environment["AYON_DEFAULT_SETTINGS_VARIANT"] = settings_variant if settings_variant == "staging": args.append("--use-staging") elif settings_variant != "production": From 6e63e24c9c3257daef87deef61476c4976f2c9ab Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:06:52 +0100 Subject: [PATCH 5/6] added better comments --- .../plugins/publish/global/submit_publish_job.py | 8 ++++---- 1 file changed, 4 insertions(+), 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 index 0da3d442f4..d138d362d1 100644 --- a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py +++ b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py @@ -199,11 +199,11 @@ def _submit_deadline_post_job( "--targets", "deadline", "--targets", "farm", ] - # TODO remove when AYON launcher respects environment variable - # 'AYON_DEFAULT_SETTINGS_VARIANT' + # TODO remove settings variant handling when not needed anymore + # which should be when package.py defines 'core>1.1.1' . settings_variant = os.environ["AYON_DEFAULT_SETTINGS_VARIANT"] - # NOTE is removed from ayon-core, but still required by - # GlobalPreLoadJob.py + # NOTE still required by GlobalPreLoadJob.py, but might not be set by + # ayon-core anymore environment["AYON_DEFAULT_SETTINGS_VARIANT"] = settings_variant if settings_variant == "staging": args.append("--use-staging") From 42018677a3cc9a2633b0ac5079237d24a0ac5f6d Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:11:50 +0100 Subject: [PATCH 6/6] set 'AYON_DEFAULT_SETTINGS_VARIANT' in collect job env vars --- .../plugins/publish/global/collect_deadline_job_env_vars.py | 4 ++++ .../plugins/publish/global/submit_publish_job.py | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py b/client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py index 79150ebb79..9b2cf63a5b 100644 --- a/client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py +++ b/client/ayon_deadline/plugins/publish/global/collect_deadline_job_env_vars.py @@ -30,6 +30,10 @@ class CollectDeadlineJobEnvVars(pyblish.api.ContextPlugin): # Not sure how this is usefull for farm, scared to remove "PYBLISHPLUGINPATH", + + # NOTE still required by GlobalPreLoadJob.py, but might not be set by + # ayon-core anymore + "AYON_DEFAULT_SETTINGS_VARIANT", ] def process(self, context): diff --git a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py index d138d362d1..9eb97b9e51 100644 --- a/client/ayon_deadline/plugins/publish/global/submit_publish_job.py +++ b/client/ayon_deadline/plugins/publish/global/submit_publish_job.py @@ -202,9 +202,6 @@ def _submit_deadline_post_job( # TODO remove settings variant handling when not needed anymore # which should be when package.py defines 'core>1.1.1' . settings_variant = os.environ["AYON_DEFAULT_SETTINGS_VARIANT"] - # NOTE still required by GlobalPreLoadJob.py, but might not be set by - # ayon-core anymore - environment["AYON_DEFAULT_SETTINGS_VARIANT"] = settings_variant if settings_variant == "staging": args.append("--use-staging") elif settings_variant != "production":