From: "Frank Ch. Eigler" <fche@elastic.org>
To: buildbot@sourceware.org
Subject: committing: source git description bunsen metadata
Date: Fri, 26 Aug 2022 13:58:39 -0400 [thread overview]
Message-ID: <YwkJz9eeeB2Ysp/d@elastic.org> (raw)
Hi -
I'm about to commit the buildbot config patch below, which aims to add
an additional property to the bunsen-collected data about the source
tree: the output of the source snapshot's "git describe --all
--always". This should make more interesting source topology
traversals/comparisions be easier in the bunsen database by a new
metadata key/value pair. (In principle, it is possible to
retroactively compute this for preexisting testruns, but only as a
sqlite database artifact rather than in the bunsendb git repo.)
diff --git a/builder/master.cfg b/builder/master.cfg
index 318adad7d0da..f7f14db0230d 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -989,6 +989,9 @@ def bunsen_logfile_upload_steps(files,
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitname",
command=util.Interpolate("echo %(prop:got_revision)s > "+bunsen_tmpdir+"/.bunsen.source.gitname")))
+ s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitdescribe",
+ command=util.Interpolate("echo %(prop:commit-description)s > "+bunsen_tmpdir+"/.bunsen.source.gitdescribe"),
+ haltOnFailure=False,flunkOnFailure=False))
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitbranch",
command=util.Interpolate("echo %(src::branch)s > "+bunsen_tmpdir+"/.bunsen.source.gitbranch")))
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitrepo",
@@ -1034,6 +1037,9 @@ def bunsen_logfile_upload_cpio_steps(paths, # [FOO, BAR] fed to cpio ( -ipath FO
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitname",
command=util.Interpolate("echo %(prop:got_revision)s > "+bunsen_tmpdir+"/.bunsen.source.gitname")))
+ s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitdescribe",
+ command=util.Interpolate("echo %(prop:commit-description)s > "+bunsen_tmpdir+"/.bunsen.source.gitdescribe"),
+ haltOnFailure=False,flunkOnFailure=False))
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitbranch",
command=util.Interpolate("echo %(src::branch)s > "+bunsen_tmpdir+"/.bunsen.source.gitbranch")))
s.append(steps.MasterShellCommand(name="pass .bunsen.source.gitrepo",
@@ -1053,6 +1059,7 @@ bzip2_step_git = steps.Git(
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
name="git checkout",
+ getDescription={'all':True, 'always':True},
haltOnFailure=True)
bzip2_step_git_tests = steps.Git(
repourl='https://sourceware.org/git/bzip2-tests.git',
@@ -1061,6 +1068,7 @@ bzip2_step_git_tests = steps.Git(
alwaysUseLatest=True,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout bzip2-tests",
haltOnFailure=True)
bzip2_step_make = make_step
@@ -1214,6 +1222,7 @@ debugedit_factory.addStep(steps.Git(
repourl=debugedit_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True))
debugedit_factory.addStep(autoreconf_step)
@@ -1354,6 +1363,7 @@ dwz_factory.addStep(steps.Git(
repourl=dwz_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True))
dwz_factory.addStep(make_step)
@@ -1484,6 +1494,7 @@ elfutils_git_step = steps.Git(
repourl=elfutils_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
# configure with running tests under valgrind enabled.
@@ -1835,6 +1846,7 @@ gccrust_git_step = steps.Git(
repourl=gccrust_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
@@ -2035,6 +2047,7 @@ binutils_step_git = steps.Git(
repourl=binutils_gdb_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
binutils_step_rm_build_dir = steps.ShellCommand(
@@ -2351,6 +2364,7 @@ gdb_git_step = steps.Git(
repourl=binutils_gdb_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
gdb_rm_step = steps.ShellCommand(
@@ -2753,6 +2767,7 @@ c['builders'].append(gdb_armhf_ubuntu22_04_builder)
repourl=binutils_gdb_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True))
binutils_gdb_factory.addStep(steps.Configure(
@@ -2806,6 +2821,7 @@ gcc_git_step = steps.Git(
repourl=gcc_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
@@ -2814,6 +2830,7 @@ gcc_build_git_step = steps.Git(
repourl=gcc_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
@@ -3052,6 +3069,7 @@ glibc_git_step = steps.Git(
repourl=glibc_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
@@ -3224,6 +3242,7 @@ libabigail_git_step = steps.Git(
repourl=libabigail_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
libabigail_make_check_test_suite_step = steps.Test(
@@ -3510,6 +3529,7 @@ valgrind_git_step = steps.Git(
repourl=valgrind_repourl,
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True)
valgrind_autogen_step = steps.ShellCommand(
@@ -3673,6 +3693,7 @@ systemtap_factory.addStep(steps.Git(
workdir='systemtap',
mode='full', method='fresh',
retryFetch=True, retry=(30,3),
+ getDescription={'all':True, 'always':True},
name="git checkout",
haltOnFailure=True))
systemtap_factory.addStep(steps.ShellCommand(
reply other threads:[~2022-08-26 17:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YwkJz9eeeB2Ysp/d@elastic.org \
--to=fche@elastic.org \
--cc=buildbot@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).