phase1: create version directories

[buildbot.git] / phase1 / master.cfg

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 7740840d2283f7412b88fffff4918f5cd29e1e3a..e44535930f13af4cb66ec6d9251652d31a6753c6 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -96,10 +96,8 @@ if ini.has_option("gpg", "passfile"):
 targets = [ ]
 
 if not os.path.isdir(home_dir+'/source.git'):
-       subprocess.call(["git", "clone", "--depth=1", repo_url, home_dir+'/source.git'])
-       subprocess.call(["git", "checkout", repo_branch], cwd = home_dir+'/source.git')
+       subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, home_dir+'/source.git'])
 else:
-       subprocess.call(["git", "checkout", repo_branch], cwd = home_dir+'/source.git')
        subprocess.call(["git", "pull"], cwd = home_dir+'/source.git')
 
 findtargets = subprocess.Popen([home_dir+'/dumpinfo.pl', 'targets'],
@@ -149,7 +147,7 @@ c['schedulers'].append(ForceScheduler(
 # only take place on one slave.
 
 from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import Git
+from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
 from buildbot.steps.shell import SetProperty
 from buildbot.steps.transfer import FileUpload
@@ -176,6 +174,34 @@ def IsCleanRequested(pattern):
 
        return CheckCleanProperty
 
+def IsTaggingRequested(step):
+       val = step.getProperty("tag")
+       if val and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", val):
+               return True
+       else:
+               return False
+
+def IsNoTaggingRequested(step):
+       return not IsTaggingRequested(step)
+
+def IsNoMasterBuild(step):
+       return repo_branch != "master"
+
+def GetBaseVersion(props):
+       if re.match("^[^-]+-[0-9]+\.[0-9]+$", repo_branch):
+               return repo_branch.split('-')[1]
+       else:
+               return "master"
+
+def GetVersionPrefix(props):
+       basever = GetBaseVersion(props)
+       if props.hasProperty("tag") and re.match("^[0-9]+\.[0-9]+\.[0-9]+$", props["tag"]):
+               return "%s/" % props["tag"]
+       elif basever != "master":
+               return "%s-HEAD/" % basever
+       else:
+               return ""
+
 
 c['builders'] = []
 
@@ -275,8 +301,50 @@ 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
+       ))
+
+       # switch to branch
+       factory.addStep(ShellCommand(
+               name = "switchbranch",
+               description = "Checking out Git branch",
+               command = ["git", "checkout", repo_branch],
+               haltOnFailure = True,
+               doStepIf = IsNoTaggingRequested
+       ))
+
        # check out the source
-       factory.addStep(Git(repourl=repo_url, branch=repo_branch, mode='update'))
+       factory.addStep(Git(
+               repourl = repo_url,
+               branch = repo_branch,
+               mode = 'incremental',
+               method = 'clean'))
+
+       # fetch tags
+       factory.addStep(ShellCommand(
+               name = "fetchtag",
+               description = "Fetching Git tags",
+               command = ["git", "fetch", "--tags", "--", repo_url],
+               haltOnFailure = True,
+               doStepIf = IsTaggingRequested
+       ))
+
+       # switch to tag
+       factory.addStep(ShellCommand(
+               name = "switchtag",
+               description = "Checking out Git tag",
+               command = ["git", "checkout", WithProperties("tags/v%(tag:-)s")],
+               haltOnFailure = True,
+               doStepIf = IsTaggingRequested
+       ))
 
        factory.addStep(ShellCommand(
                name = "rmtmp",
@@ -475,8 +543,7 @@ for target in targets:
                        description = "Signing files",
                        command = ["%s/signall.sh" %(home_dir), "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]), gpg_keyid, gpg_comment],
                        env = {'GNUPGHOME': gpg_home, 'PASSFILE': gpg_passfile},
-                       haltOnFailure = True,
-                       logEnviron = False
+                       haltOnFailure = True
                ))
 
                factory.addStep(FileDownload(
@@ -494,9 +561,24 @@ for target in targets:
 
        # upload
        factory.addStep(ShellCommand(
-               name = "uploadprepare",
-               description = "Preparing target directory",
-               command=["rsync", "-av", "--include", "/%s/" %(ts[0]), "--include", "/%s/%s/" %(ts[0], ts[1]), "--exclude", "/*", "--exclude", "/*/*", "--exclude", "/%s/%s/*" %(ts[0], ts[1]), "bin/targets/", "%s/targets/" %(rsync_bin_url)],
+               name = "dirprepare",
+               description = "Preparing upload directory structure",
+               command = ["mkdir", "-p", WithProperties("tmp/upload/%%(prefix)stargets/%s/%s" %(ts[0], ts[1]), prefix=GetVersionPrefix)],
+               haltOnFailure = True
+       ))
+
+       factory.addStep(ShellCommand(
+               name = "linkprepare",
+               description = "Preparing repository symlink",
+               command = ["ln", "-s", "-f", WithProperties("../packages-%(basever)s", basever=GetBaseVersion), WithProperties("tmp/upload/%(prefix)spackages", prefix=GetVersionPrefix)],
+               doStepIf = IsNoMasterBuild,
+               haltOnFailure = True
+       ))
+
+       factory.addStep(ShellCommand(
+               name = "dirupload",
+               description = "Uploading directory structure",
+               command = ["rsync", "-avz", "tmp/upload/", "%s/" %(rsync_bin_url)],
                env={'RSYNC_PASSWORD': rsync_bin_key},
                haltOnFailure = True,
                logEnviron = False
@@ -505,7 +587,9 @@ for target in targets:
        factory.addStep(ShellCommand(
                name = "targetupload",
                description = "Uploading target files",
-               command=["rsync", "--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])), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+               command=["rsync", "--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},
                haltOnFailure = True,
                logEnviron = False