Menu
▾
▴
[Valgrind-developers] [COMMITTED] Update valgrind (try) builders
|
From: Mark W. <ma...@kl...> - 2024-09-08 20:25:27
|
Remove the opensuse x86_64 builders. They don't add much extra.
Add an ibm-power10 and a fedora-arm64 try builder.
Don't run the auxchecks. They are unreliable.
Add || true to make regtest becuase the regtests aren't zero fail.
Add valgrind_regtest_step and bunsen upload for dist_factory.
Add collapseRequests=True to all builders.
---
builder/master.cfg | 129 +++++++++++++++++++++------------------------
1 file changed, 59 insertions(+), 70 deletions(-)
diff --git a/builder/master.cfg b/builder/master.cfg
index bd25aeeaf8ca..399a8579ae5f 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -845,9 +845,8 @@ valgrind_scheduler = schedulers.SingleBranchScheduler(
"valgrind-fedora-s390x",
"valgrind-debian-ppc64",
# "valgrind-debian-arm64",
- "valgrind-fedora-arm64",
- "valgrind-opensusetw-x86_64",
- "valgrind-opensuseleap-x86_64"])
+ "valgrind-fedora-arm64"])
+
c['schedulers'].append(valgrind_scheduler)
valgrind_try_scheduler = schedulers.AnyBranchScheduler(
@@ -858,12 +857,13 @@ valgrind_try_scheduler = schedulers.AnyBranchScheduler(
builderNames=["valgrind-try-debian-armhf",
"valgrind-try-debian-i386",
"valgrind-try-ibm-power9",
+ "valgrind-try-ibm-power10",
"valgrind-try-fedora-x86_64",
"valgrind-try-fedora-ppc64le",
"valgrind-try-fedora-s390x",
"valgrind-try-debian-ppc64",
# "valgrind-try-debian-arm64",
- "valgrind-try-opensuseleap-x86_64"])
+ "valgrind-try-fedora-arm64"])
c['schedulers'].append(valgrind_try_scheduler)
valgrind_snapshot_scheduler = schedulers.Periodic(
@@ -4684,16 +4684,10 @@ valgrind_git_step = steps.Git(
valgrind_autogen_step = steps.ShellCommand(
command=["./autogen.sh"],
name="autogen", haltOnFailure=True)
-# Note we use command as string so it gets passed to /bin/sh -c
-valgrind_auxchecks_step = steps.Test(
- command=util.Interpolate(
- 'make --output-sync=line -j%(prop:ncpus)s auxchecks AUX_CHECK_DIR=$HOME/valgrind-auxtests'),
- name="make auxchecks",
- flunkOnFailure=True,
- haltOnFailure=False)
+# Since the regtests aren't zero fail on most arches we || true
valgrind_regtest_step = steps.Test(
- command='make regtest',
+ command='make regtest || true',
name="make regtest",
flunkOnFailure=True,
haltOnFailure=False)
@@ -4726,29 +4720,30 @@ valgrind_dist_factory.addStep(valgrind_git_step)
valgrind_dist_factory.addStep(valgrind_autogen_step)
valgrind_dist_factory.addStep(configure_step)
valgrind_dist_factory.addStep(make_step)
+valgrind_dist_factory.addStep(make_check_step)
+valgrind_dist_factory.addStep(valgrind_regtest_step)
+valgrind_dist_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.sum", "*.log", "*.trs"]))
valgrind_dist_factory.addStep(make_distcheck_step)
valgrind_dist_factory.addStep(make_distclean_step)
-valgrind_make_check_aux_factory = util.BuildFactory()
-valgrind_make_check_aux_factory.addStep(valgrind_git_step)
-valgrind_make_check_aux_factory.addStep(valgrind_autogen_step)
-valgrind_make_check_aux_factory.addStep(configure_step)
-valgrind_make_check_aux_factory.addStep(make_step)
-valgrind_make_check_aux_factory.addStep(make_check_step)
-valgrind_make_check_aux_factory.addStep(valgrind_auxchecks_step)
-valgrind_make_check_aux_factory.addStep(valgrind_regtest_step)
-valgrind_make_check_aux_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.sum", "*.log", "*.trs"]))
-valgrind_make_check_aux_factory.addStep(make_distclean_step)
+valgrind_make_check_factory = util.BuildFactory()
+valgrind_make_check_factory.addStep(valgrind_git_step)
+valgrind_make_check_factory.addStep(valgrind_autogen_step)
+valgrind_make_check_factory.addStep(configure_step)
+valgrind_make_check_factory.addStep(make_step)
+valgrind_make_check_factory.addStep(make_check_step)
+valgrind_make_check_factory.addStep(valgrind_regtest_step)
+valgrind_make_check_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.sum", "*.log", "*.trs"]))
+valgrind_make_check_factory.addStep(make_distclean_step)
# For arm32 because it is slow and make check doesn't build...
-valgrind_make_aux_factory = util.BuildFactory()
-valgrind_make_aux_factory.addStep(valgrind_git_step)
-valgrind_make_aux_factory.addStep(valgrind_autogen_step)
-valgrind_make_aux_factory.addStep(configure_step)
-valgrind_make_aux_factory.addStep(make_step)
-valgrind_make_aux_factory.addStep(valgrind_auxchecks_step)
-valgrind_make_aux_factory.addSteps(bunsen_logfile_upload_cpio_steps(["*.sum", "*.log", "*.trs"]))
-valgrind_make_aux_factory.addStep(make_distclean_step)
+valgrind_make_factory = util.BuildFactory()
+valgrind_make_factory.addStep(valgrind_git_step)
+valgrind_make_factory.addStep(valgrind_autogen_step)
+valgrind_make_factory.addStep(configure_step)
+valgrind_make_factory.addStep(make_step)
+# No bunsen because no checks are ran.
+valgrind_make_factory.addStep(make_distclean_step)
# trunk snapshots
valgrind_snapshots_trunk_factory = util.BuildFactory()
@@ -4768,6 +4763,7 @@ valgrind_fedora_x86_64_builder = util.BuilderConfig(
readContainerFile('fedora-latest')},
workernames=vm_workers,
tags=["valgrind", "fedora", "x86_64"],
+ collapseRequests=True,
factory=valgrind_dist_factory)
c['builders'].append(valgrind_fedora_x86_64_builder)
@@ -4801,14 +4797,24 @@ valgrind_fedora_arm64_builder = util.BuilderConfig(
name="valgrind-fedora-arm64",
workernames=["fedora-arm64"],
tags=["valgrind", "fedora", "arm64"],
- factory=valgrind_make_check_aux_factory)
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_fedora_arm64_builder)
+valgrind_try_fedora_arm64_builder = util.BuilderConfig(
+ name="valgrind-try-fedora-arm64",
+ workernames=["fedora-arm64"],
+ tags=["valgrind-try", "fedora", "arm64"],
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
+c['builders'].append(valgrind_try_fedora_arm64_builder)
+
valgrind_debian_i386_builder = util.BuilderConfig(
name="valgrind-debian-i386",
workernames=debian_i386_workers,
tags=["valgrind", "debian", "i386"],
- factory=valgrind_make_check_aux_factory)
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_debian_i386_builder)
valgrind_try_debian_i386_builder = util.BuilderConfig(
@@ -4816,7 +4822,7 @@ valgrind_try_debian_i386_builder = util.BuilderConfig(
workernames=debian_i386_workers,
tags=["valgrind-try", "debian", "i386"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_try_debian_i386_builder)
valgrind_debian_armhf_builder = util.BuilderConfig(
@@ -4824,7 +4830,7 @@ valgrind_debian_armhf_builder = util.BuilderConfig(
workernames=["debian-armhf"],
tags=["valgrind", "debian", "armhf"],
collapseRequests=True,
- factory=valgrind_make_aux_factory)
+ factory=valgrind_make_factory)
c['builders'].append(valgrind_debian_armhf_builder)
valgrind_try_debian_armhf_builder = util.BuilderConfig(
@@ -4832,7 +4838,7 @@ valgrind_try_debian_armhf_builder = util.BuilderConfig(
workernames=["debian-armhf"],
tags=["valgrind-try", "debian", "armhf"],
collapseRequests=True,
- factory=valgrind_make_aux_factory)
+ factory=valgrind_make_factory)
c['builders'].append(valgrind_try_debian_armhf_builder)
valgrind_fedora_s390x_builder = util.BuilderConfig(
@@ -4840,7 +4846,7 @@ valgrind_fedora_s390x_builder = util.BuilderConfig(
workernames=["fedora-s390x"],
tags=["valgrind", "fedora", "s390x"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_fedora_s390x_builder)
valgrind_try_fedora_s390x_builder = util.BuilderConfig(
@@ -4848,14 +4854,15 @@ valgrind_try_fedora_s390x_builder = util.BuilderConfig(
workernames=["fedora-s390x"],
tags=["valgrind-try", "fedora", "s390x"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_try_fedora_s390x_builder)
valgrind_debian_ppc64_builder = util.BuilderConfig(
name="valgrind-debian-ppc64",
workernames=["debian-ppc64"],
tags=["valgrind", "debian", "ppc64"],
- factory=valgrind_make_check_aux_factory)
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_debian_ppc64_builder)
valgrind_try_debian_ppc64_builder = util.BuilderConfig(
@@ -4863,7 +4870,7 @@ valgrind_try_debian_ppc64_builder = util.BuilderConfig(
workernames=["debian-ppc64"],
tags=["valgrind-try", "debian", "ppc64"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_try_debian_ppc64_builder)
valgrind_fedora_ppc64le_builder = util.BuilderConfig(
@@ -4871,7 +4878,7 @@ valgrind_fedora_ppc64le_builder = util.BuilderConfig(
workernames=["fedora-ppc64le"],
tags=["valgrind", "fedora", "ppc64le"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_fedora_ppc64le_builder)
valgrind_try_fedora_ppc64le_builder = util.BuilderConfig(
@@ -4879,14 +4886,15 @@ valgrind_try_fedora_ppc64le_builder = util.BuilderConfig(
workernames=["fedora-ppc64le"],
tags=["valgrind-try", "fedora", "ppc64le"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_try_fedora_ppc64le_builder)
valgrind_ibm_power9_builder = util.BuilderConfig(
name="valgrind-ibm-power9",
workernames=["ibm_power9"],
tags=["valgrind", "ibm", "power9"],
- factory=valgrind_make_check_aux_factory)
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_ibm_power9_builder)
valgrind_try_ibm_power9_builder = util.BuilderConfig(
@@ -4894,43 +4902,24 @@ valgrind_try_ibm_power9_builder = util.BuilderConfig(
workernames=["ibm_power9"],
tags=["valgrind-try", "ibm", "power9"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_try_ibm_power9_builder)
valgrind_ibm_power10_builder = util.BuilderConfig(
name="valgrind-ibm-power10",
workernames=["ibm_power10"],
tags=["valgrind", "ibm", "power10"],
- factory=valgrind_make_check_aux_factory)
+ collapseRequests=True,
+ factory=valgrind_make_check_factory)
c['builders'].append(valgrind_ibm_power10_builder)
-valgrind_opensusetw_x86_64_builder = util.BuilderConfig(
- name="valgrind-opensusetw-x86_64",
- properties={'container-file':
- readContainerFile('opensuse-tumbleweed')},
- workernames=vm_workers,
- tags=["valgrind", "opensusetw", "x86_64"],
- factory=valgrind_make_check_aux_factory)
-c['builders'].append(valgrind_opensusetw_x86_64_builder)
-
-valgrind_opensuseleap_x86_64_builder = util.BuilderConfig(
- name="valgrind-opensuseleap-x86_64",
- properties={'container-file':
- readContainerFile('opensuse-leap')},
- workernames=vm_workers,
- tags=["valgrind", "opensuseleap", "x86_64"],
- factory=valgrind_make_check_aux_factory)
-c['builders'].append(valgrind_opensuseleap_x86_64_builder)
-
-valgrind_try_opensuseleap_x86_64_builder = util.BuilderConfig(
- name="valgrind-try-opensuseleap-x86_64",
- properties={'container-file':
- readContainerFile('opensuse-leap')},
- workernames=vm_workers,
- tags=["valgrind-try", "opensuseleap", "x86_64"],
+valgrind_try_ibm_power10_builder = util.BuilderConfig(
+ name="valgrind-try-ibm-power10",
+ workernames=["ibm_power10"],
+ tags=["valgrind-try", "ibm", "power10"],
collapseRequests=True,
- factory=valgrind_make_check_aux_factory)
-c['builders'].append(valgrind_try_opensuseleap_x86_64_builder)
+ factory=valgrind_make_check_factory)
+c['builders'].append(valgrind_try_ibm_power10_builder)
# valgrind_rawhide_x86_64_builder = util.BuilderConfig(
# name="valgrind-rawhide-x86_64",
--
2.46.0
|
