[patch] tweak systemtap-fedrawhide to optimize
Frank Ch. Eigler
fche@elastic.org
Thu Jun 25 16:20:17 GMT 2026
commit d4149cf4975e528ac487ff388e233594ec93a1dc (HEAD -> main)
gpg: Signature made Thu 25 Jun 2026 12:19:50 PM EDT
gpg: using EDDSA key C60CFE9F27405101D06DE3B86D8D01ADE253B252
gpg: Good signature from "Frank Ch. Eigler <fche@sourceware.org>" [ultimate]
gpg: aka "Frank Ch. Eigler <fche@elastic.org>" [ultimate]
Primary key fingerprint: C60C FE9F 2740 5101 D06D E3B8 6D8D 01AD E253 B252
Author: Frank Ch. Eigler <fche@redhat.com>
Date: Thu Jun 25 12:18:40 2026 -0400
systemtap builders: tweak more
- merge environment_sanity.exp and the four designated smoke .exp
tests into a single make-check invocation, now that these builders have
a more specific purpose
- move privileged-builder-name ctor functions near to where they're used,
not intermingled with unprivileged-builder area steps
diff --git a/builder/master.cfg b/builder/master.cfg
index 5073f95bd361..7eb66c021a35 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -5460,86 +5460,19 @@ systemtap_factory.addStep(steps.Compile(
command=['make', 'install', util.Interpolate('-j%(prop:maxcpus)s')],
name='make install',
haltOnFailure=True))
-systemtap_factory.addStep(steps.Test(
- workdir='stap-build',
- command=['env', 'DEBUGINFOD_URLS=https://debuginfod.elfutils.org/ https://debuginfod.fedoraproject.org/ https://debuginfod.centos.org/',
- 'make', 'check', 'RUNTESTFLAGS=environment_sanity.exp'],
- name='make check smoke test',
- haltOnFailure=False, flunkOnFailure=True))
def doStepIfPreviousPassed(buildstep):
return buildstep.build.results == SUCCESS
-def make_builder_set(project, worker_configs, factory, config_dict):
- """
- Create a set of builders for a project, optionally including try variants.
-
- Args:
- project: Project name (e.g., "systemtap")
- worker_configs: List of tuples (worker_name, os_type, arch)
- e.g., [("stap-fedora42-x86_64", "fedora", "x86_64")]
- factory: The BuildFactory to use
- config_dict: The config dictionary to append builders to (usually c)
-
- Returns:
- List of builder names created
- """
- builder_names = []
- for worker_name, os_type, arch in worker_configs:
- builder = util.BuilderConfig(
- name=worker_name,
- collapseRequests=True,
- workernames=[worker_name],
- tags=[project, os_type, arch],
- factory=factory)
- config_dict['builders'].append(builder)
- builder_names.append(worker_name)
- return builder_names
-
-def make_try_builder_set(project, worker_configs, factory, config_dict):
- """
- Create a set of try builders for a project.
-
- Args:
- project: Project name (e.g., "systemtap")
- worker_configs: List of tuples (base_worker_name, os_type, arch)
- e.g., [("stap-fedora42-x86_64", "fedora", "x86_64")]
- Try builder names will be created by inserting "-try-"
- factory: The BuildFactory to use
- config_dict: The config dictionary to append builders to (usually c)
-
- Returns:
- List of try builder names created
- """
- try_builder_names = []
- for worker_name, os_type, arch in worker_configs:
- # e.g., "stap-fedora42" -> "stap-try-fedora42"
- parts = worker_name.split('-', maxsplit=1)
- if len(parts) == 2:
- try_name = f"{parts[0]}-try-{parts[1]}"
- else:
- try_name = f"{worker_name}-try"
-
- builder = util.BuilderConfig(
- name=try_name,
- collapseRequests=True,
- workernames=[worker_name], # Use original worker
- tags=[f"{project}-try", os_type, arch],
- factory=factory)
- config_dict['builders'].append(builder)
- try_builder_names.append(try_name)
- return try_builder_names
-
systemtap_factory.addStep(steps.Test(
workdir='stap-build',
command=['env', 'DEBUGINFOD_URLS=https://debuginfod.elfutils.org/ https://debuginfod.fedoraproject.org/ https://debuginfod.centos.org/',
'make', 'check', # but not installcheck - this is the unprivileged subset of the testsuite
- 'RUNTESTFLAGS=additional_scripts.exp bz10078.exp cu-decl.exp warnings.exp', # quick build-compat testing only
+ 'RUNTESTFLAGS=environment_sanity.exp additional_scripts.exp bz10078.exp cu-decl.exp warnings.exp', # quick build-compat testing only
],
- name='make check',
+ name='make smoke check',
timeout=3600,
- doStepIf=doStepIfPreviousPassed,
- haltOnFailure=False, flunkOnFailure=False)) # some failures are normal for stap
+ haltOnFailure=False, flunkOnFailure=True))
systemtap_factory.addStep(steps.ShellCommand(
workdir="stap-build",
command=["rm", "-rf",
@@ -5601,20 +5534,19 @@ systemtap_clang_factory.addStep(steps.Compile(
systemtap_clang_factory.addStep(steps.Test(
workdir='stap-build',
command=['env', 'DEBUGINFOD_URLS=https://debuginfod.elfutils.org/ https://debuginfod.fedoraproject.org/ https://debuginfod.centos.org/',
- 'make', 'check', 'RUNTESTFLAGS=environment_sanity.exp'],
- name='make check smoke test',
- haltOnFailure=False, flunkOnFailure=True))
-systemtap_clang_factory.addStep(steps.Test(
- workdir='stap-build',
- command=['env', 'DEBUGINFOD_URLS=https://debuginfod.elfutils.org/ https://debuginfod.fedoraproject.org/ https://debuginfod.centos.org/',
- 'make', 'check'], # but not installcheck - this is the unprivileged subset of the testsuite
- name='make check',
+ 'make', 'check', # but not installcheck - this is the unprivileged subset of the testsuite
+ 'RUNTESTFLAGS=environment_sanity.exp additional_scripts.exp bz10078.exp cu-decl.exp warnings.exp', # quick build-compat testing only
+ ],
+ name='make smoke check',
timeout=3600,
doStepIf=doStepIfPreviousPassed,
- haltOnFailure=False, flunkOnFailure=False)) # some failures are normal for stap
+ haltOnFailure=False, flunkOnFailure=True))
systemtap_clang_factory.addStep(steps.ShellCommand(
workdir="stap-build",
- command=["rm", "-rf", "testsuite/.systemtap-buildbot/cache"], # ugly hardcoding bot username :-(
+ command=["rm", "-rf",
+ "testsuite/.systemtap-buildbot/cache", "testsuite/.cache_tests-buildbot",
+ "testsuite/.systemtap-builder/cache", "testsuite/.cache_tests-builder", # ansible fleet
+ ], # ugly hardcoding bot usernames :-(
name="cleanup caches",
haltOnFailure=True))
systemtap_clang_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.sum", "*.log"],
@@ -5704,6 +5636,67 @@ systemtap_privileged_factory.addSteps(bunsen_logfile_upload_cpio_steps(
["*.sum", "*.log", "*.dmesg"],
workdir="stap-build"))
+
+def make_builder_set(project, worker_configs, factory, config_dict):
+ """
+ Create a set of builders for a project, optionally including try variants.
+
+ Args:
+ project: Project name (e.g., "systemtap")
+ worker_configs: List of tuples (worker_name, os_type, arch)
+ e.g., [("stap-fedora42-x86_64", "fedora", "x86_64")]
+ factory: The BuildFactory to use
+ config_dict: The config dictionary to append builders to (usually c)
+
+ Returns:
+ List of builder names created
+ """
+ builder_names = []
+ for worker_name, os_type, arch in worker_configs:
+ builder = util.BuilderConfig(
+ name=worker_name,
+ collapseRequests=True,
+ workernames=[worker_name],
+ tags=[project, os_type, arch],
+ factory=factory)
+ config_dict['builders'].append(builder)
+ builder_names.append(worker_name)
+ return builder_names
+
+def make_try_builder_set(project, worker_configs, factory, config_dict):
+ """
+ Create a set of try builders for a project.
+
+ Args:
+ project: Project name (e.g., "systemtap")
+ worker_configs: List of tuples (base_worker_name, os_type, arch)
+ e.g., [("stap-fedora42-x86_64", "fedora", "x86_64")]
+ Try builder names will be created by inserting "-try-"
+ factory: The BuildFactory to use
+ config_dict: The config dictionary to append builders to (usually c)
+
+ Returns:
+ List of try builder names created
+ """
+ try_builder_names = []
+ for worker_name, os_type, arch in worker_configs:
+ # e.g., "stap-fedora42" -> "stap-try-fedora42"
+ parts = worker_name.split('-', maxsplit=1)
+ if len(parts) == 2:
+ try_name = f"{parts[0]}-try-{parts[1]}"
+ else:
+ try_name = f"{worker_name}-try"
+
+ builder = util.BuilderConfig(
+ name=try_name,
+ collapseRequests=True,
+ workernames=[worker_name], # Use original worker
+ tags=[f"{project}-try", os_type, arch],
+ factory=factory)
+ config_dict['builders'].append(builder)
+ try_builder_names.append(try_name)
+ return try_builder_names
+
# systemtap_privileged_workers is defined in the schedulers section above
# Create regular systemtap privileged builders and try builders
make_builder_set("systemtap", systemtap_privileged_workers, systemtap_privileged_factory, c)
More information about the Buildbot
mailing list