From cdf7af65bf9ecad7fe6bb1fee7760ab22bf0cc6b Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:20:56 +0100 Subject: [PATCH 1/3] pass 'AYON_USE_STAGING' instead of 'AYON_DEFAULT_SETTINGS_VARIANT' --- client/ayon_core/plugins/publish/collect_farm_env_variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/plugins/publish/collect_farm_env_variables.py b/client/ayon_core/plugins/publish/collect_farm_env_variables.py index ee88985905..2a58b580cd 100644 --- a/client/ayon_core/plugins/publish/collect_farm_env_variables.py +++ b/client/ayon_core/plugins/publish/collect_farm_env_variables.py @@ -32,7 +32,7 @@ class CollectCoreJobEnvVars(pyblish.api.ContextPlugin): for key in [ "AYON_BUNDLE_NAME", - "AYON_DEFAULT_SETTINGS_VARIANT", + "AYON_USE_STAGING", "AYON_IN_TESTS", # NOTE Not sure why workdir is needed? "AYON_WORKDIR", From ccd5e447842b632ffad3f0ec352db8d6ccedf799 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 11:52:03 +0100 Subject: [PATCH 2/3] keep filling 'AYON_DEFAULT_SETTINGS_VARIANT' for now --- client/ayon_core/plugins/publish/collect_farm_env_variables.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/ayon_core/plugins/publish/collect_farm_env_variables.py b/client/ayon_core/plugins/publish/collect_farm_env_variables.py index 2a58b580cd..7ee3356cee 100644 --- a/client/ayon_core/plugins/publish/collect_farm_env_variables.py +++ b/client/ayon_core/plugins/publish/collect_farm_env_variables.py @@ -36,6 +36,8 @@ class CollectCoreJobEnvVars(pyblish.api.ContextPlugin): "AYON_IN_TESTS", # NOTE Not sure why workdir is needed? "AYON_WORKDIR", + # DEPRECATED remove when deadline stops using it (added in 1.1.1) + "AYON_DEFAULT_SETTINGS_VARIANT", ]: value = os.getenv(key) if value: From 4b51f6479f391e853642a24059193fa3c244a772 Mon Sep 17 00:00:00 2001 From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com> Date: Fri, 7 Feb 2025 12:16:03 +0100 Subject: [PATCH 3/3] change added version --- client/ayon_core/plugins/publish/collect_farm_env_variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/ayon_core/plugins/publish/collect_farm_env_variables.py b/client/ayon_core/plugins/publish/collect_farm_env_variables.py index 7ee3356cee..2782ea86ac 100644 --- a/client/ayon_core/plugins/publish/collect_farm_env_variables.py +++ b/client/ayon_core/plugins/publish/collect_farm_env_variables.py @@ -36,7 +36,7 @@ class CollectCoreJobEnvVars(pyblish.api.ContextPlugin): "AYON_IN_TESTS", # NOTE Not sure why workdir is needed? "AYON_WORKDIR", - # DEPRECATED remove when deadline stops using it (added in 1.1.1) + # DEPRECATED remove when deadline stops using it (added in 1.1.2) "AYON_DEFAULT_SETTINGS_VARIANT", ]: value = os.getenv(key)