From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id A7388385829B for ; Sun, 19 Jun 2022 14:14:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7388385829B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x09.wildebeest.org [172.31.17.139]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id C00AD30006B1; Sun, 19 Jun 2022 16:14:44 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id 45C242E83E02; Sun, 19 Jun 2022 16:14:44 +0200 (CEST) From: Mark Wielaard To: buildbot@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] bb-start.sh: Always add some versions to the info files Date: Sun, 19 Jun 2022 16:14:41 +0200 Message-Id: <20220619141441.810310-1-mark@klomp.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: buildbot@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "The https://builder.sourceware.org/ buildbot" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jun 2022 14:14:49 -0000 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