[patch] more ccache tweaks

Frank Ch. Eigler fche@elastic.org
Fri Jun 19 17:45:27 GMT 2026


commit a05f5f801e8230bdbdb9169750db492468c047f1
gpg: Signature made Fri 19 Jun 2026 01:43:24 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:   Fri Jun 19 13:43:24 2026 -0400

    Broaden ccache stats collection regex to include GiB/MiB and size labels

diff --git a/builder/master.cfg b/builder/master.cfg
index d1f3ed648aaf..c9982e8be650 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1599,7 +1599,7 @@ def bunsen_logfile_upload_cpio_steps(paths, # [FOO, BAR] fed to cpio ( -ipath FO
                         + "for t in gcc clang ld ldconfig ccache; do b=$(command -v $t 2>/dev/null); [ -n \"$b\" ] && { p=$(rpm -q --file $b 2>/dev/null | head -1); [ -z \"$p\" ] && p=$(dpkg -S $b 2>/dev/null | cut -d: -f1 | head -1 | xargs -I {} dpkg-query -W -f='${Package}-${Version}' {} 2>/dev/null); [ -z \"$p\" ] && p=$(readelf -n $b 2>/dev/null | sed -n '/.note.package/,+4p' | tail -1); [ -n \"$p\" ] && echo \"$p\" > .bunsen.version.pkg.$t || rm -f .bunsen.version.pkg.$t; } || rm -f .bunsen.version.pkg.$t; done; "
                         + "lscpu 2>/dev/null | awk -F: 'tolower($1) ~ /^(model name|machine type)$/ {gsub(/^[ \\t]+|[ \\t]+$/, \"\", $2); print $2; exit}' > .bunsen.lscpu.model; [ -s .bunsen.lscpu.model ] || rm -f .bunsen.lscpu.model; "
                         + "lscpu 2>/dev/null | awk -F: 'tolower($1) ~ /^(flags|features)$/ {gsub(/^[ \\t]+|[ \\t]+$/, \"\", $2); print $2; exit}' > .bunsen.lscpu.flags; [ -s .bunsen.lscpu.flags ] || rm -f .bunsen.lscpu.flags; "
-                        + "ccache -s 2>/dev/null | egrep '[Hh]it|[Mm]iss|MB|GB' | sort | uniq | tr '\\n' ' ' | sed -e 's,  *, ,g' > .bunsen.ccache; [ -s .bunsen.ccache ] || rm -f .bunsen.ccache; "
+                        + "ccache -s 2>/dev/null | egrep -i '[Hh]it|[Mm]iss|[KMG]i?B|[Ss]ize' | sort | uniq | tr '\\n' ' ' | sed -e 's,  *, ,g' > .bunsen.ccache; [ -s .bunsen.ccache ] || rm -f .bunsen.ccache; "
                         + "true)"),
                 haltOnFailure=False))
         # Upload the helpversion/pkgversion metadata files (at root of bunsen_tmpdir)

commit 41bf37026625e6fa4ca591c724ed749eece1c91c (HEAD -> main)
gpg: Signature made Fri 19 Jun 2026 01:44:21 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:   Fri Jun 19 13:44:21 2026 -0400

    Replace deprecated egrep with grep -E

diff --git a/builder/master.cfg b/builder/master.cfg
index c9982e8be650..f1b9ca55bd91 100644
--- a/builder/master.cfg
+++ b/builder/master.cfg
@@ -1599,7 +1599,7 @@ def bunsen_logfile_upload_cpio_steps(paths, # [FOO, BAR] fed to cpio ( -ipath FO
                         + "for t in gcc clang ld ldconfig ccache; do b=$(command -v $t 2>/dev/null); [ -n \"$b\" ] && { p=$(rpm -q --file $b 2>/dev/null | head -1); [ -z \"$p\" ] && p=$(dpkg -S $b 2>/dev/null | cut -d: -f1 | head -1 | xargs -I {} dpkg-query -W -f='${Package}-${Version}' {} 2>/dev/null); [ -z \"$p\" ] && p=$(readelf -n $b 2>/dev/null | sed -n '/.note.package/,+4p' | tail -1); [ -n \"$p\" ] && echo \"$p\" > .bunsen.version.pkg.$t || rm -f .bunsen.version.pkg.$t; } || rm -f .bunsen.version.pkg.$t; done; "
                         + "lscpu 2>/dev/null | awk -F: 'tolower($1) ~ /^(model name|machine type)$/ {gsub(/^[ \\t]+|[ \\t]+$/, \"\", $2); print $2; exit}' > .bunsen.lscpu.model; [ -s .bunsen.lscpu.model ] || rm -f .bunsen.lscpu.model; "
                         + "lscpu 2>/dev/null | awk -F: 'tolower($1) ~ /^(flags|features)$/ {gsub(/^[ \\t]+|[ \\t]+$/, \"\", $2); print $2; exit}' > .bunsen.lscpu.flags; [ -s .bunsen.lscpu.flags ] || rm -f .bunsen.lscpu.flags; "
-                        + "ccache -s 2>/dev/null | egrep -i '[Hh]it|[Mm]iss|[KMG]i?B|[Ss]ize' | sort | uniq | tr '\\n' ' ' | sed -e 's,  *, ,g' > .bunsen.ccache; [ -s .bunsen.ccache ] || rm -f .bunsen.ccache; "
+                        + "ccache -s 2>/dev/null | grep -Ei '[Hh]it|[Mm]iss|[KMG]i?B|[Ss]ize' | sort | uniq | tr '\\n' ' ' | sed -e 's,  *, ,g' > .bunsen.ccache; [ -s .bunsen.ccache ] || rm -f .bunsen.ccache; "
                         + "true)"),
                 haltOnFailure=False))
         # Upload the helpversion/pkgversion metadata files (at root of bunsen_tmpdir)


More information about the Buildbot mailing list