From 9f629a26391c30258ad0fbce61878f364cf87527 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 3 Jul 2024 17:56:38 +0200 Subject: [PATCH 1/3] Standardize IS_TEST to AYON_IN_TESTS ayon-core/client/ayon_core/lib/ayon_info.py expects AYON_IN_TESTS which is more descriptive than just IS_TEST --- .../plugins/publish/submit_aftereffects_deadline.py | 2 +- .../plugins/publish/submit_blender_deadline.py | 2 +- .../ayon_deadline/plugins/publish/submit_fusion_deadline.py | 2 +- .../plugins/publish/submit_harmony_deadline.py | 2 +- .../ayon_deadline/plugins/publish/submit_max_deadline.py | 2 +- .../ayon_deadline/plugins/publish/submit_maya_deadline.py | 6 +++--- .../plugins/publish/submit_publish_cache_job.py | 2 +- .../ayon_deadline/plugins/publish/submit_publish_job.py | 2 +- .../repository/custom/plugins/GlobalJobPreLoad.py | 6 +++--- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py index a7be38bf3b..45d907cbba 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py @@ -87,7 +87,7 @@ class AfterEffectsSubmitDeadline( "AYON_WORKDIR", "AYON_APP_NAME", "AYON_LOG_NO_COLORS", - "IS_TEST" + "AYON_IN_TESTS" ] environment = { diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py index 479dffdcc4..073de909b4 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py @@ -110,7 +110,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "AYON_TASK_NAME", "AYON_WORKDIR", "AYON_APP_NAME", - "IS_TEST" + "AYON_IN_TESTS" ] environment = { diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py index f90bb9b597..bf9df40edc 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py @@ -217,7 +217,7 @@ class FusionSubmitDeadline( "AYON_WORKDIR", "AYON_APP_NAME", "AYON_LOG_NO_COLORS", - "IS_TEST", + "AYON_IN_TESTS", "AYON_BUNDLE_NAME", ] diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py index 1a40f6f302..bc91483c4f 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py @@ -282,7 +282,7 @@ class HarmonySubmitDeadline( "AYON_WORKDIR", "AYON_APP_NAME", "AYON_LOG_NO_COLORS" - "IS_TEST" + "AYON_IN_TESTS" ] environment = { diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py index a287630dc5..6a369eb001 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py @@ -114,7 +114,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "AYON_TASK_NAME", "AYON_WORKDIR", "AYON_APP_NAME", - "IS_TEST", + "AYON_IN_TESTS", ] environment = { diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py index beed19e007..d50b0147d9 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py @@ -216,7 +216,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, "AYON_TASK_NAME", "AYON_WORKDIR", "AYON_APP_NAME", - "IS_TEST" + "AYON_IN_TESTS" ] environment = { @@ -236,7 +236,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, job_info.EnvironmentKeyValue["AYON_LOG_NO_COLORS"] = "1" # Adding file dependencies. - if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies: + if not is_in_tests() and self.asset_dependencies: dependencies = instance.context.data["fileDependencies"] for dependency in dependencies: job_info.AssetDependency += dependency @@ -589,7 +589,7 @@ class MayaSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline, job_info = copy.deepcopy(self.job_info) - if not bool(os.environ.get("IS_TEST")) and self.asset_dependencies: + if not is_in_tests() and self.asset_dependencies: # Asset dependency to wait for at least the scene file to sync. job_info.AssetDependency += self.scene_path diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py index 2bb138d849..ddfd21dc78 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py @@ -128,7 +128,7 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, "AYON_TASK_NAME": instance.context.data["task"], "AYON_USERNAME": instance.context.data["user"], "AYON_LOG_NO_COLORS": "1", - "IS_TEST": str(int(is_in_tests())), + "AYON_IN_TESTS": str(int(is_in_tests())), "AYON_PUBLISH_JOB": "1", "AYON_RENDER_JOB": "0", "AYON_REMOTE_PUBLISH": "0", diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py index 6aafb8f1c6..11bdc461f6 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py @@ -206,7 +206,7 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, "AYON_TASK_NAME": instance.context.data["task"], "AYON_USERNAME": instance.context.data["user"], "AYON_LOG_NO_COLORS": "1", - "IS_TEST": str(int(is_in_tests())), + "AYON_IN_TESTS": str(int(is_in_tests())), "AYON_PUBLISH_JOB": "1", "AYON_RENDER_JOB": "0", "AYON_REMOTE_PUBLISH": "0", diff --git a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index ac04407f5b..cb34d4aa40 100644 --- a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -13,7 +13,7 @@ from Deadline.Scripting import ( FileUtils, DirectoryUtils, ) -__version__ = "1.1.0" +__version__ = "1.1.1" VERSION_REGEX = re.compile( r"(?P0|[1-9]\d*)" r"\.(?P0|[1-9]\d*)" @@ -342,7 +342,7 @@ def inject_openpype_environment(deadlinePlugin): "envgroup": "farm" } - if job.GetJobEnvironmentKeyValue("IS_TEST"): + if job.GetJobEnvironmentKeyValue("AYON_IN_TESTS"): args.append("--automatic-tests") if all(add_kwargs.values()): @@ -501,7 +501,7 @@ def inject_ayon_environment(deadlinePlugin): "extractenvironments", export_url ] - if job.GetJobEnvironmentKeyValue("IS_TEST"): + if job.GetJobEnvironmentKeyValue("AYON_IN_TESTS"): args.append("--automatic-tests") for key, value in add_kwargs.items(): From 7b25502044e88c485a959c3a2aed86d7aa16a585 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Wed, 3 Jul 2024 18:00:12 +0200 Subject: [PATCH 2/3] Use legacy IS_TEST env var to mark automatic tests for OP --- .../repository/custom/plugins/GlobalJobPreLoad.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index cb34d4aa40..4081f02015 100644 --- a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -342,7 +342,8 @@ def inject_openpype_environment(deadlinePlugin): "envgroup": "farm" } - if job.GetJobEnvironmentKeyValue("AYON_IN_TESTS"): + # use legacy IS_TEST env var to mark automatic tests for OP + if job.GetJobEnvironmentKeyValue("IS_TEST"): args.append("--automatic-tests") if all(add_kwargs.values()): From 237d9a18e47c6d489bc2d785375fab7c714fbcb8 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Thu, 4 Jul 2024 12:25:42 +0200 Subject: [PATCH 3/3] Use only AYON_IN_TESTS to drive automatic tests --automatic-tests is removed in AYON --- .../plugins/publish/submit_publish_cache_job.py | 3 --- .../ayon_deadline/plugins/publish/submit_publish_job.py | 3 --- .../repository/custom/plugins/GlobalJobPreLoad.py | 6 ++++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py index ddfd21dc78..d93592a6a3 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py @@ -156,9 +156,6 @@ class ProcessSubmittedCacheJobOnFarm(pyblish.api.InstancePlugin, "--targets", "farm" ] - if is_in_tests(): - args.append("--automatic-tests") - # Generate the payload for Deadline submission secondary_pool = ( self.deadline_pool_secondary or instance.data.get("secondaryPool") diff --git a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py index 11bdc461f6..643dcc1c46 100644 --- a/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py +++ b/server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py @@ -234,9 +234,6 @@ class ProcessSubmittedJobOnFarm(pyblish.api.InstancePlugin, "--targets", "farm" ] - if is_in_tests(): - args.append("--automatic-tests") - # Generate the payload for Deadline submission secondary_pool = ( self.deadline_pool_secondary or instance.data.get("secondaryPool") diff --git a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py index 4081f02015..dbd1798608 100644 --- a/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py +++ b/server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py @@ -502,8 +502,6 @@ def inject_ayon_environment(deadlinePlugin): "extractenvironments", export_url ] - if job.GetJobEnvironmentKeyValue("AYON_IN_TESTS"): - args.append("--automatic-tests") for key, value in add_kwargs.items(): args.extend(["--{}".format(key), value]) @@ -517,6 +515,10 @@ def inject_ayon_environment(deadlinePlugin): "AYON_API_KEY": ayon_api_key, "AYON_BUNDLE_NAME": ayon_bundle_name, } + + automatic_tests = job.GetJobEnvironmentKeyValue("AYON_IN_TESTS") + if automatic_tests: + environment["AYON_IN_TESTS"] = automatic_tests for env, val in environment.items(): # Add the env var for the Render Plugin that is about to render deadlinePlugin.SetEnvironmentVariable(env, val)