From: Mark Wielaard <mark@klomp.org>
To: buildbot@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [COMMITTED] bb-start.sh: Always add some versions to the info files
Date: Sun, 19 Jun 2022 16:14:41 +0200 [thread overview]
Message-ID: <20220619141441.810310-1-mark@klomp.org> (raw)
Now that it is easier to hack on the bb-start.sh file make sure the
info files are always updated and that we add the versions of gcc,
binutils and glibc in the container image.
---
builder/containers/bb-start.sh | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/builder/containers/bb-start.sh b/builder/containers/bb-start.sh
index f8203ef..31cdbc9 100755
--- a/builder/containers/bb-start.sh
+++ b/builder/containers/bb-start.sh
@@ -12,12 +12,22 @@ tac_file=$worker_dir/buildbot.tac
if [ ! -f $tac_file ]; then
mkdir -p $worker_dir
buildbot-worker create-worker $worker_dir $BUILDMASTER:$BUILDMASTER_PORT $WORKERNAME $WORKERPASS
- echo buildbot@sourceware.org > $worker_dir/info/admin
- echo $IMAGE_NAME > $worker_dir/info/host
else
sed -ie "s/^passwd = .*/passwd = '$WORKERPASS'/" $tac_file
fi
+
+# Fill in the info visible in the buildbot website
+# objcopy gives us the binutils version, iconv the glibc version
+echo buildbot@sourceware.org > $worker_dir/info/admin
+echo $IMAGE_NAME > $worker_dir/info/host
+gcc --version | head -1 >> $worker_dir/info/host
+objcopy --version | head -1 >> $worker_dir/info/host
+iconv --version | head -1 >> $worker_dir/info/host
+
+# We don't want to leak this in any logs
unset WORKERPASS
+
+# Make sure ccache is in the PATH and uses a shared cache
export PATH=$CCACHE_LIBDIR:$PATH
mkdir -p shared/$IMAGE_NAME/ccache
export CCACHE_DIR=/home/builder/shared/$IMAGE_NAME/ccache
--
2.30.2
reply other threads:[~2022-06-19 14:14 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=20220619141441.810310-1-mark@klomp.org \
--to=mark@klomp.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).