phase1: do not perform shallow fetches

[buildbot.git] / phase1 / master.cfg

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 735d2d456c703eb21e7b271fbb040dd50b18b6a6..04879e800f6ebfa17470714bc679dc1ccfc178b7 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -389,7 +389,7 @@ for target in targets:
                description = "Tagging Git repository",
                command = [home_dir+'/maketag.sh', '-i', '-k', str(gpg_keyid or ''),
                           '-p', str(gpg_passfile or ''), '-v', WithProperties("%(tag:-)s")],
-               workdir = home_dir+'/source.git',
+               path = home_dir+'/source.git',
                env = {'GNUPGHOME': gpg_home},
                haltOnFailure = True,
                doStepIf = IsTaggingRequested,
@@ -400,7 +400,7 @@ for target in targets:
        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
        ))
@@ -762,7 +762,7 @@ for target in targets:
 
        from buildbot.config import BuilderConfig
 
-       c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory, nextBuild=getNextBuild))
+       c['builders'].append(BuilderConfig(name=target, slavenames=slaveNames, factory=factory, nextBuild=GetNextBuild))
 
 
 ####### STATUS TARGETS