From 651b9fbfe22d85a4f61f77fb0dd5819f282a95eb Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Wed, 25 Sep 2024 11:21:00 +0200 Subject: [PATCH] Buildbot: Remove v330 track --- buildbot/conf/branches.py | 9 ++------- buildbot/pipeline/code.py | 7 ++----- buildbot/worker/blender/compile.py | 3 +-- buildbot/worker/blender/test.py | 9 +++------ buildbot/worker/blender/update.py | 2 +- 5 files changed, 9 insertions(+), 21 deletions(-) diff --git a/buildbot/conf/branches.py b/buildbot/conf/branches.py index 1dc2d05..f5629d5 100644 --- a/buildbot/conf/branches.py +++ b/buildbot/conf/branches.py @@ -10,7 +10,6 @@ from collections import OrderedDict code_tracked_branch_ids = { "vdev": "main", "vexp": "", - "v330": "blender-v3.3-release", "v360": "blender-v3.6-release", "v420": "blender-v4.2-release", } @@ -19,7 +18,6 @@ code_tracked_branch_ids = { code_official_platform_architectures = { "vdev": ["darwin-x86_64", "darwin-arm64", "linux-x86_64", "windows-amd64"], "vexp": ["darwin-x86_64", "darwin-arm64", "linux-x86_64", "windows-amd64"], - "v330": ["darwin-x86_64", "darwin-arm64", "linux-x86_64", "windows-amd64"], "v360": ["darwin-x86_64", "darwin-arm64", "linux-x86_64", "windows-amd64"], "v420": ["darwin-x86_64", "darwin-arm64", "linux-x86_64", "windows-amd64"], } @@ -42,31 +40,28 @@ track_code_branches = { "vdev": "main", "vexp": "main", "v360": "blender-v3.6-release", - "v330": "blender-v3.3-release", "v420": "blender-v4.2-release", } # Tracks that correspond to an LTS version released on the Windows Store. # Only add entries here AFTER the regular release is out, since it will # otherwise generate the wrong package for the regular release. -windows_store_lts_tracks = ["v330", "v360"] +windows_store_lts_tracks = ["v360"] # Tracks that correspond to active and upcoming LTS releases. Used for # the Snap track name, and for Steam to determine if there is a daily LTS # track to upload to. -all_lts_tracks = ["v330", "v360", "v420"] +all_lts_tracks = ["v360", "v420"] # Tracks for automated delivery of daily builds to stores. code_store_track_ids = [ "vdev", - "v330", "v360", "v420", ] # Tracks to deploy releases (regular and LTS) to download.blender.org. code_deploy_track_ids = { - "v330": None, "v360": None, "v420": None, } diff --git a/buildbot/pipeline/code.py b/buildbot/pipeline/code.py index 040282a..382986c 100644 --- a/buildbot/pipeline/code.py +++ b/buildbot/pipeline/code.py @@ -247,7 +247,7 @@ def create_code_worker_command_args(props, devops_env_id, track_id, pipeline_typ needs_package_delivery = needs_package_delivery in ["true", True] # Auto enable asserts when not using package delivery. Only support in 4.1+. - if track_id not in ("v330", "v360"): + if track_id not in ("v360"): if build_configuration == "release" and not needs_package_delivery: build_configuration = "asserts" @@ -545,10 +545,7 @@ def populate(devops_env_id): # Assigning different workers for different tracks, specifically Linux builders. suitable_pipeline_worker_names = pipeline_worker_names if platform_architecture == "linux-x86_64" and devops_env_id != "LOCAL": - if track_id == "v330": - selector = "centos" - else: - selector = "rocky" + selector = "rocky" suitable_pipeline_worker_names = [ worker for worker in pipeline_worker_names if selector in worker ] diff --git a/buildbot/worker/blender/compile.py b/buildbot/worker/blender/compile.py index a65b036..4161d0b 100644 --- a/buildbot/worker/blender/compile.py +++ b/buildbot/worker/blender/compile.py @@ -302,8 +302,7 @@ def get_cmake_options(builder: worker.blender.CodeBuilder) -> worker.utils.CmdSe ] # Enable option to verify enabled libraries and features did not get disabled. - if builder.track_id != "v330": - options += [f"-DWITH_STRICT_BUILD_OPTIONS=ON"] + options += [f"-DWITH_STRICT_BUILD_OPTIONS=ON"] needs_cuda_compile = builder.needs_gpu_binaries if builder.needs_gpu_binaries: diff --git a/buildbot/worker/blender/test.py b/buildbot/worker/blender/test.py index b0fe1cf..1762b84 100644 --- a/buildbot/worker/blender/test.py +++ b/buildbot/worker/blender/test.py @@ -16,12 +16,9 @@ import worker.blender.compile def get_ctest_arguments(builder: worker.blender.CodeBuilder) -> List[str]: args = ["--output-on-failure"] - # Run tests in single threads for tracks which has older OpenEXR/OpenImageIO, - # This prevents idiff.exe dead-lock on exit. - if not (builder.platform == "windows" and builder.track_id == "v330"): - # GPU tests are currently slow and can cause timeouts. - if not builder.needs_gpu_tests: - args += ["--parallel", "4"] + # GPU tests are currently slow and can cause timeouts. + if not builder.needs_gpu_tests: + args += ["--parallel", "4"] args += ["-C", worker.blender.compile.get_cmake_build_type(builder)] return args diff --git a/buildbot/worker/blender/update.py b/buildbot/worker/blender/update.py index 32d97dc..c55ed9e 100644 --- a/buildbot/worker/blender/update.py +++ b/buildbot/worker/blender/update.py @@ -48,7 +48,7 @@ def update(builder: worker.blender.CodeBuilder) -> None: builder.architecture, ] - if builder.track_id not in ("v330", "v360", "vexp"): + if builder.track_id not in ("v360", "vexp"): cmd += ["--prune-destructive"] worker.utils.call(cmd) -- 2.30.2