X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase1%2Fmaster.cfg;h=a68d0671fccff3d4df30b584cfbcc085bcdde6ae;hb=19fa08b9f8f1090f7b4922aa0e04369246633fdc;hp=abb5501d455a1f737641075adca1fbe29438d66a;hpb=d84f0f0b52587470f31aea51103cc4e6e82218ab;p=buildbot.git

diff --git a/phase1/master.cfg b/phase1/master.cfg
index abb5501..a68d067 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -246,6 +246,12 @@ def GetCwd(props):
 	else:
 		return "/"
 
+def GetNextBuild(builder, requests):
+	for r in requests:
+		if r.properties and r.properties.hasProperty("tag"):
+			return r
+	return requests[0]
+
 def MakeEnv(overrides=None):
 	env = {
 		'CC': WithProperties("%(cc)s", cc=GetCC),
@@ -260,7 +266,6 @@ def MakeEnv(overrides=None):
 c['builders'] = []
 
 dlLock = locks.SlaveLock("slave_dl")
-tagLock = locks.MasterLock("make_tag")
 
 checkBuiltin = re.sub('[\t\n ]+', ' ', """
 	checkBuiltin() {
@@ -378,23 +383,11 @@ for target in targets:
 			doStepIf = IsCleanRequested(tuple[0])
 		))
 
-	factory.addStep(MasterShellCommand(
-		name = "maketag",
-		description = "Tagging Git repository",
-		command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
-		           '-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
-		path = home_dir+'/source.git',
-		env = {'GNUPGHOME': gpg_home},
-		haltOnFailure = True,
-		doStepIf = IsTaggingRequested,
-		locks = [tagLock.access('exclusive')]
-	))
-
 	# switch to branch
 	factory.addStep(ShellCommand(
 		name = "switchbranch",
 		description = "Checking out Git branch",
-		command = "if [ -d .git ]; then git checkout '%s'; else exit 0; fi" % repo_branch,
+		command = "if [ -d .git ]; then git fetch && git checkout '%s'; else exit 0; fi" % repo_branch,
 		haltOnFailure = True,
 		doStepIf = IsNoTaggingRequested
 	))
@@ -705,7 +698,7 @@ for target in targets:
 	factory.addStep(ShellCommand(
 		name = "dirupload",
 		description = "Uploading directory structure",
-		command = ["rsync", "-avz", "tmp/upload/", "%s/" %(rsync_bin_url)],
+		command = ["rsync", "-4", "-avz", "tmp/upload/", "%s/" %(rsync_bin_url)],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False
@@ -714,7 +707,7 @@ for target in targets:
 	factory.addStep(ShellCommand(
 		name = "targetupload",
 		description = "Uploading target files",
-		command=["rsync", "--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+		command=["rsync", "-4", "--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
 		         "-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])),
 		         WithProperties("%s/%%(prefix)stargets/%s/%s/" %(rsync_bin_url, ts[0], ts[1]), prefix=GetVersionPrefix)],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
@@ -726,7 +719,7 @@ for target in targets:
 		factory.addStep(ShellCommand(
 			name = "sourceupload",
 			description = "Uploading source archives",
-			command=["rsync", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command=["rsync", "-4", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = True,
 			logEnviron = False
@@ -736,7 +729,7 @@ for target in targets:
 		factory.addStep(ShellCommand(
 			name = "packageupload",
 			description = "Uploading package files",
-			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
+			command=["rsync", "-4", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			logEnviron = False
@@ -747,7 +740,7 @@ for target in targets:
 		factory.addStep(ShellCommand(
 			name = "upload",
 			description = "Uploading logs",
-			command=["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+			command=["rsync", "-4", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
 			env={'RSYNC_PASSWORD': rsync_bin_key},
 			haltOnFailure = False,
 			alwaysRun = True,
@@ -756,7 +749,7 @@ for target in targets:
 
 	from buildbot.config import BuilderConfig
 
-	c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory))
+	c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory, nextBuild=GetNextBuild))
 
 
 ####### STATUS TARGETS