From: Atharva Lele <itsatharva@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 21/27] autobuild-run: move check_version() to Builder class
Date: Thu, 4 Jul 2019 00:01:53 +0530 [thread overview]
Message-ID: <20190703183159.3415-21-itsatharva@gmail.com> (raw)
In-Reply-To: <20190703183159.3415-1-itsatharva@gmail.com>
Upcoming patch from Thomas needs check_version() to
use http_url. As that is inside Builder class and check_version()
is only used inside Builder class, move it inside the class.
Also remove the redundant call to check_version() from main().
We already call check_version() in run_instance(). Also the fact
that we cannot call check_version() in main() since the builder
class object is not defined at that point.
Signed-off-by: Atharva Lele <itsatharva@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v1 -> v2:
- New patch
---
scripts/autobuild-run | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index 8f3e602..00d5c8e 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -178,13 +178,6 @@ def log_write(logf, msg):
logf.write("[%s] %s\n" % (strftime("%a, %d %b %Y %H:%M:%S", localtime()), msg))
logf.flush()
-def check_version():
- with urlopen_closing('http://autobuild.buildroot.org/version') as r:
- version = int(decode_bytes(r.readline()).strip())
- if version > VERSION:
- print("ERROR: script version too old, please upgrade.")
- sys.exit(1)
-
def get_branch():
"""Returns the branch that should be built. It fetches a CSV file from
autobuild.buildroot.org that provides the list of branches to test
@@ -306,6 +299,13 @@ class Builder:
else:
self.log = open(os.path.join(self.idir, "instance.log"), "a+")
+ def check_version(self):
+ with urlopen_closing('http://autobuild.buildroot.org/version') as r:
+ version = int(decode_bytes(r.readline()).strip())
+ if version > VERSION:
+ print("ERROR: script version too old, please upgrade.")
+ sys.exit(1)
+
def prepare_build(self):
"""Prepare for the next build of the specified instance
@@ -704,7 +704,7 @@ class Builder:
log_write(self.log, "INFO: instance started")
while True:
- check_version()
+ self.check_version()
ret = self.prepare_build()
if ret != 0:
@@ -763,7 +763,6 @@ def main():
# showing error messages in another language.
os.environ['LC_ALL'] = 'C'
- check_version()
sysinfo = SystemInfo()
args = docopt.docopt(doc, version=VERSION)
--
2.22.0
next prev parent reply other threads:[~2019-07-03 18:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 18:31 [Buildroot] [PATCH v2 01/27] autobuild-run: introduce Builder class Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 02/27] autobuild-run: move instance variable from kwargs to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 03/27] autobuild-run: move njobs " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 04/27] autobuild-run: move sysinfo " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 05/27] autobuild-run: move http variables " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 06/27] autobuild-run: move submitter " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 07/27] autobuild-run: move make_opts " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 08/27] autobuild-run: move niceness " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 09/27] autobuild-run: move toolchains_csv " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 10/27] autobuild-run: move repo " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 11/27] autobuild-run: move upload variable " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 12/27] autobuild-run: move buildpid " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 13/27] autobuild-run: move debug " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 14/27] autobuild-run: define instance directory as a part of " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 15/27] autobuild-run: move log variable to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 16/27] autobuild-run: remove kwargs argument from function calls and definitions Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 17/27] autobuild-run: define source directory as part of Builder class Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 18/27] autobuild-run: define download " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 19/27] autobuild-run: define output " Atharva Lele
2019-07-04 17:36 ` Arnout Vandecappelle
2019-07-03 18:31 ` [Buildroot] [PATCH v2 20/27] autobuild-run: define results " Atharva Lele
2019-07-03 18:31 ` Atharva Lele [this message]
2019-07-03 18:31 ` [Buildroot] [PATCH v2 22/27] autobuild-run: move get_branch() to " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 23/27] scripts/autobuild-run: make the HTTP URL really configurable Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 24/27] autobuild-run: create reason file on build failures Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 25/27] autobuild-run: account for reproducibility failures when creating the reason file Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 26/27] web/import.inc.php: support reading failure reason from " Atharva Lele
2019-07-03 18:31 ` [Buildroot] [PATCH v2 27/27] scripts/autobuild-run: support changing repo Atharva Lele
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=20190703183159.3415-21-itsatharva@gmail.com \
--to=itsatharva@gmail.com \
--cc=buildroot@busybox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.