Skip to content

Commit efd41b9

Browse files
committed
test: Run Cinema 4D 2026 integ tests on GPU.
Signed-off-by: Karthik Bekal Pattathana <133984042+karthikbekalp@users.noreply.github.com>
1 parent f0bbea6 commit efd41b9

2 files changed

Lines changed: 9 additions & 18 deletions

File tree

.github/workflows/integ_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
(github.ref == 'refs/heads/mainline' ||
3131
github.ref == 'refs/heads/feature/ci-tests')
3232
name: Integration Tests (Windows, Cinema 4D ${{ inputs.c4d_version }})
33-
runs-on: windows-latest
33+
runs-on: ${{ inputs.c4d_version == '2026' && 'aws-deadline_windows-2025_gpu-t4-4-core' || 'windows-latest' }}
3434
timeout-minutes: 60
3535
permissions:
3636
id-token: write

test/integ/test_cinema4d.py

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -631,23 +631,14 @@ def _run_integ_case(
631631
rmtree(actual_dir, ignore_errors=True)
632632

633633

634-
# Keep the Redshift cases running in Windows CI, but do not block the workflow
635-
# on their intermittent render failures. All Redshift cases are affected in
636-
# Cinema 4D 2024 and 2025; the textured case is also affected in Cinema 4D 2026.
637-
# This is a Cinema 4D issue and we have a ticket with Maxon to add a fix.
638-
_XFAIL_REDSHIFT_2024_2025_IN_CI = pytest.mark.xfail(
634+
# Reliable Redshift rendering requires a GPU. Unlike standard runners, GPU
635+
# runners are billed, so Windows CI runs Redshift only for the latest supported
636+
# Cinema 4D version, 2026, and skips the 2024 and 2025 cases.
637+
_SKIP_REDSHIFT_2024_2025_IN_CI = pytest.mark.skipif(
639638
sys.platform == "win32"
640639
and os.environ.get("CI") == "true"
641640
and os.environ.get("C4D_VERSION") in {"2024", "2025"},
642-
reason="Redshift rendering can fail with Cinema 4D 2024 and 2025",
643-
strict=False,
644-
)
645-
_XFAIL_REDSHIFT_TEXTURED_IN_CI = pytest.mark.xfail(
646-
sys.platform == "win32"
647-
and os.environ.get("CI") == "true"
648-
and os.environ.get("C4D_VERSION") in {"2024", "2025", "2026"},
649-
reason="Redshift textured rendering can fail with Cinema 4D 2024, 2025, and 2026",
650-
strict=False,
641+
reason="Redshift requires a billed GPU runner, so CI runs it only for the latest Cinema 4D version (2026)",
651642
)
652643
_SKIP_OCIO_2024 = pytest.mark.skipif(
653644
os.environ.get("C4D_VERSION", "2026") == "2024",
@@ -683,9 +674,9 @@ def _run_integ_case(
683674
"physical_multi_takes",
684675
"physical_tiles_multi_takes",
685676
"phy_apos_path",
686-
pytest.param("redshift", marks=_XFAIL_REDSHIFT_2024_2025_IN_CI),
687-
pytest.param("redshift_textured", marks=_XFAIL_REDSHIFT_TEXTURED_IN_CI),
688-
pytest.param("redshift_tiles", marks=_XFAIL_REDSHIFT_2024_2025_IN_CI),
677+
pytest.param("redshift", marks=_SKIP_REDSHIFT_2024_2025_IN_CI),
678+
pytest.param("redshift_textured", marks=_SKIP_REDSHIFT_2024_2025_IN_CI),
679+
pytest.param("redshift_tiles", marks=_SKIP_REDSHIFT_2024_2025_IN_CI),
689680
]
690681

691682
_TAKE_SELECTIONS = [

0 commit comments

Comments
 (0)