Skip to content

Add dtrace worker tag support #754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
encukou merged 3 commits into from
Aug 20, 2026
Merged

Add dtrace worker tag support #754

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60f0eef
Add dtrace worker tag support
stratakis Jul 2, 2026
344c3c6
Tag cstratak workers for dtrace builds
stratakis Jul 2, 2026
e2124c0
Merge branch 'main' into even_more_minimal_dtrace
encukou Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions master/custom/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
Expand Down Expand Up @@ -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)
)
)

Expand Down Expand Up @@ -432,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",
]
Expand Down
36 changes: 22 additions & 14 deletions master/custom/workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -100,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(
Expand All @@ -123,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
),
Expand All @@ -154,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(
Expand All @@ -176,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(
Expand All @@ -199,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(
Expand All @@ -215,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(
Expand Down