Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #747 from ynput/chore/standardize_IS_TEST_env_var

Browse source 
Tests: Standardize IS_TEST to AYON_IN_TESTS
This commit is contained in:
Petr Kalis 2024-07-04 18:41:26 +02:00 • committed by GitHub
commit 06e7b2f9d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_aftereffects_deadline.py
View file

@ -87,7 +87,7 @@ class AfterEffectsSubmitDeadline(
"AYON_WORKDIR",
"AYON_APP_NAME",
"AYON_LOG_NO_COLORS",
"IS_TEST"
"AYON_IN_TESTS"
]
environment = {

2
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_blender_deadline.py
View file

@ -110,7 +110,7 @@ class BlenderSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
"AYON_TASK_NAME",
"AYON_WORKDIR",
"AYON_APP_NAME",
"IS_TEST"
"AYON_IN_TESTS"
]
environment = {

2
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_fusion_deadline.py
View file

@ -217,7 +217,7 @@ class FusionSubmitDeadline(
"AYON_WORKDIR",
"AYON_APP_NAME",
"AYON_LOG_NO_COLORS",
"IS_TEST",
"AYON_IN_TESTS",
"AYON_BUNDLE_NAME",
]

2
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_harmony_deadline.py
View file

@ -282,7 +282,7 @@ class HarmonySubmitDeadline(
"AYON_WORKDIR",
"AYON_APP_NAME",
"AYON_LOG_NO_COLORS"
"IS_TEST"
"AYON_IN_TESTS"
]
environment = {

2
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_max_deadline.py
View file

@ -114,7 +114,7 @@ class MaxSubmitDeadline(abstract_submit_deadline.AbstractSubmitDeadline,
"AYON_TASK_NAME",
"AYON_WORKDIR",
"AYON_APP_NAME",
"IS_TEST",
"AYON_IN_TESTS",
]
environment = {

6
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_maya_deadline.py
View file

@ -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

5
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_cache_job.py
View file

@ -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",
@ -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")

5
server_addon/deadline/client/ayon_deadline/plugins/publish/submit_publish_job.py
View file

@ -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",
@ -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")

9
server_addon/deadline/client/ayon_deadline/repository/custom/plugins/GlobalJobPreLoad.py
View file

@ -13,7 +13,7 @@ from Deadline.Scripting import (
FileUtils,
DirectoryUtils,
)
__version__ = "1.1.0"
__version__ = "1.1.1"
VERSION_REGEX = re.compile(
r"(?P<major>0|[1-9]\d*)"
r"\.(?P<minor>0|[1-9]\d*)"
@ -342,6 +342,7 @@ def inject_openpype_environment(deadlinePlugin):
"envgroup": "farm"
}
# use legacy IS_TEST env var to mark automatic tests for OP
if job.GetJobEnvironmentKeyValue("IS_TEST"):
args.append("--automatic-tests")
@ -501,8 +502,6 @@ def inject_ayon_environment(deadlinePlugin):
"extractenvironments",
export_url
]
if job.GetJobEnvironmentKeyValue("IS_TEST"):
args.append("--automatic-tests")
for key, value in add_kwargs.items():
args.extend(["--{}".format(key), value])
@ -516,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)