From 60f0eefb6320e596dc19178300a0ef3af6773369 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 2 Jul 2026 16:07:46 +0200 Subject: [PATCH 1/2] Add dtrace worker tag support Co-authored-by: Petr Viktorin --- master/custom/factories.py | 2 ++ master/custom/workers.py | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/master/custom/factories.py b/master/custom/factories.py index eb8cb166..dd608816 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -119,6 +119,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs): oot_kwargs = {} configure_cmd = [configure_cmd, "--prefix", "$(PWD)/target"] configure_cmd += self.configureFlags + configure_cmd += worker.get_configure_flags(branch) self.addStep( Configure(command=configure_cmd, **oot_kwargs) ) @@ -225,6 +226,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs): Configure( command=["./configure", "--prefix", "$(PWD)/target"] + self.configureFlags + + worker.get_configure_flags(branch) ) ) diff --git a/master/custom/workers.py b/master/custom/workers.py index 806cff61..f1078781 100644 --- a/master/custom/workers.py +++ b/master/custom/workers.py @@ -68,6 +68,14 @@ def __init__( max_builds=parallel_builders, ) + def get_configure_flags(self, branch): + if "dtrace" in self.tags and ( + branch.is_pr or branch.version_tuple >= (3, 15) + ): + return ["--with-dtrace"] + return [] + + # Some of Itamar's workers are reprovisioned every Wednesday at 9am PT. # Builds scheduled between 8am - 10am PT on Wednesdays will be delayed to # 10am PT. From 344c3c6d3e540abedf602065bc7c7b407050cc39 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 2 Jul 2026 16:09:15 +0200 Subject: [PATCH 2/2] Tag cstratak workers for dtrace builds Co-authored-by: Petr Viktorin --- master/custom/factories.py | 2 -- master/custom/workers.py | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/master/custom/factories.py b/master/custom/factories.py index dd608816..a55c2d7d 100644 --- a/master/custom/factories.py +++ b/master/custom/factories.py @@ -434,8 +434,6 @@ class RHEL8Build(UnixBuild): "--with-ssl-default-suites=openssl", "--without-static-libpython", "--with-lto", - # Not all workers have dtrace installed - # "--with-dtrace", "--with-valgrind", "--with-system-libmpdec", ] diff --git a/master/custom/workers.py b/master/custom/workers.py index f1078781..482eb995 100644 --- a/master/custom/workers.py +++ b/master/custom/workers.py @@ -108,12 +108,12 @@ def get_workers(settings): ), cpw( name="cstratak-fedora-rawhide-x86_64", - tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'], + tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64', 'dtrace'], parallel_tests=10, ), cpw( name="cstratak-fedora-stable-x86_64", - tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'], + tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64', 'dtrace'], parallel_tests=10, ), cpw( @@ -131,25 +131,25 @@ def get_workers(settings): ), cpw( name="cstratak-CentOS9-x86_64", - tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'], + tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'dtrace'], parallel_tests=6, ), cpw( name="cstratak-CentOS9-fips-x86_64", - tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'], + tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips', 'dtrace'], parallel_tests=6, # Only 3.12+ for FIPS builder not_branches=["3.10", "3.11"], ), cpw( name="cstratak-fedora-rawhide-ppc64le", - tags=['linux', 'unix', 'fedora', 'ppc64le'], + tags=['linux', 'unix', 'fedora', 'ppc64le', 'dtrace'], parallel_tests=10, timeout_factor=2, # Increase the timeout on this slow worker ), cpw( name="cstratak-fedora-stable-ppc64le", - tags=['linux', 'unix', 'fedora', 'ppc64le'], + tags=['linux', 'unix', 'fedora', 'ppc64le', 'dtrace'], parallel_tests=10, timeout_factor=2, # Increase the timeout on this slow worker ), @@ -162,18 +162,18 @@ def get_workers(settings): ), cpw( name="cstratak-CentOS9-ppc64le", - tags=['linux', 'unix', 'rhel', 'ppc64le'], + tags=['linux', 'unix', 'rhel', 'ppc64le', 'dtrace'], parallel_tests=10, timeout_factor=2, # Increase the timeout on this slow worker ), cpw( name="cstratak-fedora-rawhide-aarch64", - tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'], + tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64', 'dtrace'], parallel_tests=32, ), cpw( name="cstratak-fedora-stable-aarch64", - tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'], + tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64', 'dtrace'], parallel_tests=32, ), cpw( @@ -184,12 +184,12 @@ def get_workers(settings): ), cpw( name="cstratak-CentOS9-aarch64", - tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'], + tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64', 'dtrace'], parallel_tests=32, ), cpw( name="cstratak-CentOS10-aarch64", - tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'], + tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64', 'dtrace'], parallel_tests=32, ), cpw( @@ -207,12 +207,12 @@ def get_workers(settings): ), cpw( name="cstratak-fedora-rawhide-s390x", - tags=['linux', 'unix', 'fedora', 's390x'], + tags=['linux', 'unix', 'fedora', 's390x', 'dtrace'], parallel_tests=10, ), cpw( name="cstratak-fedora-stable-s390x", - tags=['linux', 'unix', 'fedora', 's390x'], + tags=['linux', 'unix', 'fedora', 's390x', 'dtrace'], parallel_tests=10, ), cpw( @@ -223,7 +223,7 @@ def get_workers(settings): ), cpw( name="cstratak-rhel9-s390x", - tags=['linux', 'unix', 'rhel', 's390x'], + tags=['linux', 'unix', 'rhel', 's390x', 'dtrace'], parallel_tests=10, ), cpw(