From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1EBAF138334 for ; Tue, 2 Jul 2019 09:04:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4B667E0866; Tue, 2 Jul 2019 09:04:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B0B4E0866 for ; Tue, 2 Jul 2019 09:04:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EAED346E09 for ; Tue, 2 Jul 2019 09:04:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D48BE58B for ; Tue, 2 Jul 2019 09:04:43 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1562058276.4b38da959964050bb8a9160123b6ebe563a845fa.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/auto-bootstraps/analyse_result.py X-VCS-Directories: scripts/auto-bootstraps/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 4b38da959964050bb8a9160123b6ebe563a845fa X-VCS-Branch: master Date: Tue, 2 Jul 2019 09:04:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8a1a6126-e0d2-49ea-83bc-fe193e61f69d X-Archives-Hash: 8a2e8b63a67fee39a3a6e2d48789514b commit: 4b38da959964050bb8a9160123b6ebe563a845fa Author: Fabian Groffen gentoo org> AuthorDate: Tue Jul 2 09:04:07 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Jul 2 09:04:36 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=4b38da95 scripts/auto-bootstraps/analyse_result: print snapshot tree in use Signed-off-by: Fabian Groffen gentoo.org> scripts/auto-bootstraps/analyse_result.py | 42 +++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/scripts/auto-bootstraps/analyse_result.py b/scripts/auto-bootstraps/analyse_result.py index dbe0d4c729..b67e494bd7 100755 --- a/scripts/auto-bootstraps/analyse_result.py +++ b/scripts/auto-bootstraps/analyse_result.py @@ -118,6 +118,7 @@ with os.scandir(resultsdir) as it: elapsedtime = None haslssl = False + snapshot = None if suc: elapsedf = os.path.join(resultsdir, arch, "%s" % suc, "elapsedtime") if os.path.exists(elapsedf): @@ -125,16 +126,30 @@ with os.scandir(resultsdir) as it: l = f.readline() if l is not '': elapsedtime = int(l) - mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf") - if os.path.exists(mconf): - with open(mconf, 'rb') as f: - l = [x.decode('utf-8', 'ignore') for x in f.readlines()] - l = list(filter(lambda x: 'USE=' in x, l)) - for x in l: - if 'libressl' in x: - haslssl = True - - archs[arch] = (fail, state, suc, elapsedtime, haslssl) + + mconf = os.path.join(resultsdir, arch, "%s" % suc, "make.conf") + if os.path.exists(mconf): + with open(mconf, 'rb') as f: + l = [x.decode('utf-8', 'ignore') for x in f.readlines()] + l = list(filter(lambda x: 'USE=' in x, l)) + for x in l: + if 'libressl' in x: + haslssl = True + + mconf = os.path.join(resultsdir, arch, "%s" % suc, "stage1.log") + if os.path.exists(mconf): + with open(mconf, 'rb') as f: + l = [x.decode('utf-8', 'ignore') for x in f.readlines()] + for x in l: + if 'Fetching ' in x: + if 'portage-latest.tar.bz2' in x: + snapshot = 'latest' + elif 'prefix-overlay-' in x: + snapshot = re.split('[-.]', x)[2] + elif 'total size is' in x: + snapshot = 'rsync' + + archs[arch] = (fail, state, suc, elapsedtime, haslssl, snapshot) if not suc: color = '\033[1;31m' # red elif fail and suc < fail: @@ -157,7 +172,7 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h: h.write("last successful runlast failed run") h.write("failure") for arch in sarchs: - fail, errcode, suc, et, lssl = archs[arch] + fail, errcode, suc, et, lssl, snap = archs[arch] if not suc: state = 'red' elif fail and suc < fail: @@ -170,6 +185,11 @@ with open(os.path.join(resultsdir, 'index.html'), "w") as h: tags = tags + ''' libressl +''' + if snap: + tags = tags + ''' +''' + snap + ''' ''' h.write('')