Skip to content

Commit 62f8557

Browse files
stratakisencukou
stratakis
and
encukou
authored
Add dtrace worker tag support, tag cstratak's workers (GH-754)
Co-authored-by: Petr Viktorin <encukou@gmail.com>
1 parent 569e89e commit 62f8557

2 files changed

Lines changed: 24 additions & 16 deletions

File tree

‎master/custom/factories.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
140140
oot_kwargs = {}
141141
configure_cmd = [configure_cmd, "--prefix", "$(PWD)/target"]
142142
configure_cmd += self.configureFlags
143+
configure_cmd += worker.get_configure_flags(branch)
143144
self.addStep(
144145
Configure(command=configure_cmd, **oot_kwargs)
145146
)
@@ -232,6 +233,7 @@ def setup(self, branch, worker, test_with_PTY=False, **kwargs):
232233
Configure(
233234
command=["./configure", "--prefix", "$(PWD)/target"]
234235
+ self.configureFlags
236+
+ worker.get_configure_flags(branch)
235237
)
236238
)
237239

@@ -449,8 +451,6 @@ class RHEL8Build(UnixBuild):
449451
"--with-ssl-default-suites=openssl",
450452
"--without-static-libpython",
451453
"--with-lto",
452-
# Not all workers have dtrace installed
453-
# "--with-dtrace",
454454
"--with-valgrind",
455455
"--with-system-libmpdec",
456456
]

‎master/custom/workers.py‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,14 @@ def __init__(
7171
max_builds=parallel_builders,
7272
)
7373

74+
def get_configure_flags(self, branch):
75+
if "dtrace" in self.tags and (
76+
branch.is_pr or branch.version_tuple >= (3, 15)
77+
):
78+
return ["--with-dtrace"]
79+
return []
80+
81+
7482
# Some of Itamar's workers are reprovisioned every Wednesday at 9am PT.
7583
# Builds scheduled between 8am - 10am PT on Wednesdays will be delayed to
7684
# 10am PT.
@@ -103,12 +111,12 @@ def get_workers(settings):
103111
),
104112
cpw(
105113
name="cstratak-fedora-rawhide-x86_64",
106-
tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'],
114+
tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64', 'dtrace'],
107115
parallel_tests=10,
108116
),
109117
cpw(
110118
name="cstratak-fedora-stable-x86_64",
111-
tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64'],
119+
tags=['linux', 'unix', 'fedora', 'amd64', 'x86-64', 'dtrace'],
112120
parallel_tests=10,
113121
),
114122
cpw(
@@ -126,25 +134,25 @@ def get_workers(settings):
126134
),
127135
cpw(
128136
name="cstratak-CentOS9-x86_64",
129-
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64'],
137+
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'dtrace'],
130138
parallel_tests=6,
131139
),
132140
cpw(
133141
name="cstratak-CentOS9-fips-x86_64",
134-
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips'],
142+
tags=['linux', 'unix', 'rhel', 'amd64', 'x86-64', 'fips', 'dtrace'],
135143
parallel_tests=6,
136144
# Only 3.12+ for FIPS builder
137145
branches=BRANCHES.only_since(3, 12),
138146
),
139147
cpw(
140148
name="cstratak-fedora-rawhide-ppc64le",
141-
tags=['linux', 'unix', 'fedora', 'ppc64le'],
149+
tags=['linux', 'unix', 'fedora', 'ppc64le', 'dtrace'],
142150
parallel_tests=10,
143151
timeout_factor=2, # Increase the timeout on this slow worker
144152
),
145153
cpw(
146154
name="cstratak-fedora-stable-ppc64le",
147-
tags=['linux', 'unix', 'fedora', 'ppc64le'],
155+
tags=['linux', 'unix', 'fedora', 'ppc64le', 'dtrace'],
148156
parallel_tests=10,
149157
timeout_factor=2, # Increase the timeout on this slow worker
150158
),
@@ -157,18 +165,18 @@ def get_workers(settings):
157165
),
158166
cpw(
159167
name="cstratak-CentOS9-ppc64le",
160-
tags=['linux', 'unix', 'rhel', 'ppc64le'],
168+
tags=['linux', 'unix', 'rhel', 'ppc64le', 'dtrace'],
161169
parallel_tests=10,
162170
timeout_factor=2, # Increase the timeout on this slow worker
163171
),
164172
cpw(
165173
name="cstratak-fedora-rawhide-aarch64",
166-
tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'],
174+
tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64', 'dtrace'],
167175
parallel_tests=32,
168176
),
169177
cpw(
170178
name="cstratak-fedora-stable-aarch64",
171-
tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64'],
179+
tags=['linux', 'unix', 'fedora', 'arm', 'arm64', 'aarch64', 'dtrace'],
172180
parallel_tests=32,
173181
),
174182
cpw(
@@ -179,12 +187,12 @@ def get_workers(settings):
179187
),
180188
cpw(
181189
name="cstratak-CentOS9-aarch64",
182-
tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'],
190+
tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64', 'dtrace'],
183191
parallel_tests=32,
184192
),
185193
cpw(
186194
name="cstratak-CentOS10-aarch64",
187-
tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64'],
195+
tags=['linux', 'unix', 'rhel', 'arm', 'arm64', 'aarch64', 'dtrace'],
188196
parallel_tests=32,
189197
),
190198
cpw(
@@ -202,12 +210,12 @@ def get_workers(settings):
202210
),
203211
cpw(
204212
name="cstratak-fedora-rawhide-s390x",
205-
tags=['linux', 'unix', 'fedora', 's390x'],
213+
tags=['linux', 'unix', 'fedora', 's390x', 'dtrace'],
206214
parallel_tests=10,
207215
),
208216
cpw(
209217
name="cstratak-fedora-stable-s390x",
210-
tags=['linux', 'unix', 'fedora', 's390x'],
218+
tags=['linux', 'unix', 'fedora', 's390x', 'dtrace'],
211219
parallel_tests=10,
212220
),
213221
cpw(
@@ -218,7 +226,7 @@ def get_workers(settings):
218226
),
219227
cpw(
220228
name="cstratak-rhel9-s390x",
221-
tags=['linux', 'unix', 'rhel', 's390x'],
229+
tags=['linux', 'unix', 'rhel', 's390x', 'dtrace'],
222230
parallel_tests=10,
223231
),
224232
cpw(

0 commit comments

Comments
 (0)