From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from elastic.org (elastic.org [96.126.110.187]) by sourceware.org (Postfix) with ESMTPS id 700033850858 for ; Fri, 26 Aug 2022 17:58:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 700033850858 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=elastic.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=elastic.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=elastic.org ; s=default2; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date: Sender:Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=eNBQznO8DYl0aMLwyNVDSaHcgB6F/hqXeC4j8v8m+nc=; b=eVu/EsefpDJXIeGTPoSWffDbAL ojDm/AUHiUiLJRXN19wVtYz3Y9/AY3QSLYcitc/Ns3LvaD/pkPgpHt70WDjyr9o/yRumKVG4L6uED tEJrKkSN3+NBS5pKWXunJqMQD8Fs5uP/t3oCb4fc6XbyR5BOrZ4RhY8eLrygEEi4glDkIYwBMZ6Rp EO/eyr60LhElWh9zuOg4rBfasiR3/1wa09WLq7x8VlhUJ3Djj6iwpqVn5DmzhaVD5ZPv8d7yGMZRv mwb+wkqAWtF0tDoMkQ2jY6Ft6MHwFRF7F3lzYAv3ns+axQux0EregtlJFOAXxxw8sWuNpp3nM4BRG jbSaSOHg==; Received: from vpn-home.elastic.org ([10.0.0.2] helo=elastic.org) by elastic.org with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oRdbL-0006Im-Od for buildbot@sourceware.org; Fri, 26 Aug 2022 17:58:39 +0000 Received: from fche by elastic.org with local (Exim 4.94.2) (envelope-from ) id 1oRdbL-000M5K-8q for buildbot@sourceware.org; Fri, 26 Aug 2022 13:58:39 -0400 Date: Fri, 26 Aug 2022 13:58:39 -0400 From: "Frank Ch. Eigler" To: buildbot@sourceware.org Subject: committing: source git description bunsen metadata Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-107.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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(