Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH buildroot-test 8/8] autobuild-run: add support for custom git wrapper
Date: Thu, 16 Oct 2014 21:16:04 +0200	[thread overview]
Message-ID: <1413486964-5183-8-git-send-email-patrickdepinguin@gmail.com> (raw)
In-Reply-To: <1413486964-5183-1-git-send-email-patrickdepinguin@gmail.com>

From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

In corporate environments, there may be no direct git access, and a
wrapper program that sets a proxy may be needed. See [1] for an example
solution.

This patch to autobuild-run provides a --git argument that can be used
to set the path to such a git wrapper. By default, the argument is plain
'git'.

[1] http://gitolite.com/git-over-proxy.html

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
 scripts/autobuild-run | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/scripts/autobuild-run b/scripts/autobuild-run
index ceed0ae..42441d0 100755
--- a/scripts/autobuild-run
+++ b/scripts/autobuild-run
@@ -74,6 +74,9 @@ Options:
                                  only)
   --make-opts OPTSTRING          string of extra options to pass to Buildroot
                                  make, such as specific command wrappers
+  --git GITCMD                   path to git program (possibly a wrapper) used
+                                 to clone the Buildroot repository
+                                 [default: git]
   -c, --config CONFIG            path to configuration file
 
 Format of the configuration file:
@@ -224,7 +227,7 @@ def prepare_build(**kwargs):
     # didn't exist already.
     srcdir = os.path.join(idir, "buildroot")
     if not os.path.exists(srcdir):
-        ret = subprocess.call(["git", "clone", "git://git.busybox.net/buildroot", srcdir],
+        ret = subprocess.call([kwargs['git'], "clone", "git://git.busybox.net/buildroot", srcdir],
                               stdout=log, stderr=log)
         if ret != 0:
             log_write(log, "ERROR: could not clone Buildroot sources")
@@ -232,7 +235,7 @@ def prepare_build(**kwargs):
 
     # Update the Buildroot sources.
     abssrcdir = os.path.abspath(srcdir)
-    ret = subprocess.call(["git", "pull"], cwd=srcdir, stdout=log, stderr=log)
+    ret = subprocess.call([kwargs['git'], "pull"], cwd=srcdir, stdout=log, stderr=log)
     if ret != 0:
         log_write(log, "ERROR: could not pull Buildroot sources")
         return -1
@@ -475,8 +478,8 @@ def send_results(result, **kwargs):
         shutil.copyfile(os.path.join(outputdir, "legal-info", "manifest.csv"),
                         os.path.join(resultdir, "licenses-manifest.csv"))
 
-    subprocess.call(["git log master -n 1 --pretty=format:%%H > %s" % \
-                     os.path.join(resultdir, "gitid")],
+    subprocess.call(["%s log master -n 1 --pretty=format:%%H > %s" % \
+                     (kwargs['git'], os.path.join(resultdir, "gitid"))],
                     shell=True, cwd=srcdir)
     subprocess.call(["tail -500 %s > %s" % \
                      (os.path.join(outputdir, "logfile"), os.path.join(resultdir, "build-end.log"))],
@@ -610,7 +613,7 @@ def main():
         p = Process(target=run_instance, kwargs={
             'instance': i, 'njobs': args['--njobs'], 'sysinfo': sysinfo,
             'http_login': args['--http-login'],
-            'http_password': args['--http-password'],
+            'http_password': args['--http-password'], 'git': args['--git'],
             'submitter': args['--submitter'], 'make_opts': args['--make-opts']})
         p.start()
         processes.append(p)
-- 
1.8.5.1

  parent reply	other threads:[~2014-10-16 19:16 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-16 19:15 [Buildroot] [PATCH buildroot-test 1/8] autobuild-run: check-requirements does not need to know the login details Thomas De Schampheleire
2014-10-16 19:15 ` [Buildroot] [PATCH buildroot-test 2/8] scripts: add python module docopt Thomas De Schampheleire
2014-10-16 19:15 ` [Buildroot] [PATCH buildroot-test 3/8] autobuild-run: use docopt for argument parsing Thomas De Schampheleire
2014-10-16 19:16 ` [Buildroot] [PATCH buildroot-test 4/8] autobuild-run: convert regular function comments into docstrings Thomas De Schampheleire
2014-10-16 19:16 ` [Buildroot] [PATCH buildroot-test 5/8] autobuild-run: add option --make-opts for custom Buildroot options Thomas De Schampheleire
2014-10-17 10:46   ` Thomas De Schampheleire
2014-10-16 19:16 ` [Buildroot] [PATCH buildroot-test 6/8] autobuild-run: create main method to locally-scope all variables Thomas De Schampheleire
2014-10-17 22:24   ` Yann E. MORIN
2014-10-18 11:02     ` Maxime Hadjinlian
2014-10-16 19:16 ` [Buildroot] [PATCH buildroot-test 7/8] autobuild-run: use **kwargs to avoid explicit parameter passthroughs Thomas De Schampheleire
2014-10-17 11:27   ` Thomas De Schampheleire
2014-10-16 19:16 ` Thomas De Schampheleire [this message]
2014-10-17 22:30   ` [Buildroot] [PATCH buildroot-test 8/8] autobuild-run: add support for custom git wrapper Yann E. MORIN
2014-10-18 13:00     ` Thomas Petazzoni
2014-10-18 19:08       ` Thomas De Schampheleire
2014-10-17 22:20 ` [Buildroot] [PATCH buildroot-test 1/8] autobuild-run: check-requirements does not need to know the login details Yann E. MORIN
2014-10-18 10:15   ` Maxime Hadjinlian
2014-10-18 10:25     ` Yann E. MORIN
2014-10-18 10:38       ` Maxime Hadjinlian
2014-10-18 13:38   ` Arnout Vandecappelle
2014-10-18 13:52     ` Maxime Hadjinlian
2014-10-18 17:34       ` Yann E. MORIN
2014-10-18 19:06         ` Thomas De Schampheleire

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=1413486964-5183-8-git-send-email-patrickdepinguin@gmail.com \
    --to=patrickdepinguin@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox