From 0866e2dad23e86cb423665268bbd6235b2188869 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 1 Oct 2010 04:42:59 +0200 Subject: autobuild-remote: Support autobuild.py rather than land.py. Autobuild-User: Jelmer Vernooij Autobuild-Date: Fri Oct 1 09:46:37 UTC 2010 on sn-devel-104 --- source4/script/land-remote.py | 50 ------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100755 source4/script/land-remote.py (limited to 'source4/script') diff --git a/source4/script/land-remote.py b/source4/script/land-remote.py deleted file mode 100755 index 3635e1b328..0000000000 --- a/source4/script/land-remote.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/python -# Land a branch by building and testing it on sn-104 before landing it on master. -# Copyright (C) 2010 Jelmer Vernooij -# Published under the GPL, v3 or later - -import os -import optparse -import subprocess -import sys - -parser = optparse.OptionParser("land-remote [options]") -parser.add_option("--host", help="Host to land on (SSH connection string)", type=str, default="sn-devel-104.sn.samba.org") -parser.add_option("--dry-run", help="Dry run (don't actually land)", action="store_true", default=False) -parser.add_option("--foreground", help="Don't daemonize", action="store_true", default=False) -parser.add_option("--mail-to", help="Email address to send build/test output to", type=str, default=None, metavar="MAIL-TO") - -(opts, args) = parser.parse_args() - -if not opts.foreground and not opts.mail_to: - print "Not running in foreground and --mail-to not specified." - sys.exit(1) - -print "%s$ mktemp -d" % opts.host -f = subprocess.Popen(["ssh", opts.host, "mktemp", "-d"], stdout=subprocess.PIPE) -(stdout, stderr) = f.communicate() -if f.returncode != 0: - sys.exit(1) -remote_tmpdir = stdout.rstrip() - -print "Remote tempdir: %s" % remote_tmpdir - -remote_args = ["git", "clone", "git://git.samba.org/samba.git", "%s/repo" % remote_tmpdir] -print "%s$ %s" % (opts.host, " ".join(remote_args)) -subprocess.check_call(["ssh", opts.host] + remote_args) - -print "Pushing local branch" -print "$ " + " ".join(args) -subprocess.check_call(["git", "push", "--force", "git+ssh://%s/%s/repo" % (opts.host, remote_tmpdir), "HEAD:refs/heads/land"]) -remote_args = ["python", "%s/repo/source4/script/land.py" % remote_tmpdir] -if opts.mail_to: - remote_args.append("--mail-to=%s" % opts.mail_to) -if not opts.foreground: - remote_args.append("--daemon") -if opts.dry_run: - remote_args.append("--dry-run") -remote_args.append("--branch=land") -remote_args.append(os.path.join(remote_tmpdir, "repo")) -print "%s$ %s" % (opts.host, " ".join(remote_args)) -args = ["ssh", "-A", opts.host] + remote_args -sys.exit(subprocess.call(args)) -- cgit