phase1: set rsync timeouts
[buildbot.git] / phase1 / master.cfg
index 41968b5782606b1d13e2354df41c855f9616c514..118e8676100d1a9f6421c3d66931b70edb58dd11 100644 (file)
@@ -340,7 +340,6 @@ def MakeEnv(overrides=None, tryccache=False):
        env = {
                'CC': envcc,
                'CXX': envcxx,
-               'CCACHE_BASEDIR': Interpolate("%(kw:cwd)s", cwd=GetCwd)
        }
        if overrides is not None:
                env.update(overrides)
@@ -443,6 +442,7 @@ for target in targets:
        # find gcc and g++ compilers
        if cc_version is not None:
                factory.addStep(FileDownload(
+                       name = "dlfindbinpl",
                        mastersrc = "findbin.pl",
                        slavedest = "../findbin.pl",
                        mode = 0755))
@@ -474,6 +474,7 @@ for target in targets:
        # expire tree if needed
        if tree_expire > 0:
                factory.addStep(FileDownload(
+                       name = "dlexpiresh",
                        doStepIf = IsExpireRequested,
                        mastersrc = "expire.sh",
                        slavedest = "../expire.sh",
@@ -490,6 +491,7 @@ for target in targets:
 
        # cleanup.sh if needed
        factory.addStep(FileDownload(
+                       name = "dlcleanupsh",
                mastersrc = "cleanup.sh",
                slavedest = "../cleanup.sh",
                mode = 0755,
@@ -531,6 +533,7 @@ for target in targets:
        # Git() parameters can't take a renderer until buildbot 0.8.10, so we have to split the fresh and clean cases
        # if buildbot is updated, one can use: method = Interpolate('%(prop:do_cleanup:#?|fresh|clean)s')
        factory.addStep(Git(
+               name = "gitclean",
                repourl = repo_url,
                branch = repo_branch,
                mode = 'full',
@@ -540,6 +543,7 @@ for target in targets:
        ))
 
        factory.addStep(Git(
+               name = "gitfresh",
                repourl = repo_url,
                branch = repo_branch,
                mode = 'full',
@@ -599,6 +603,7 @@ for target in targets:
 
        # seed config
        factory.addStep(FileDownload(
+               name = "dlconfigseed",
                mastersrc = "config.seed",
                slavedest = ".config",
                mode = 0644
@@ -642,23 +647,9 @@ for target in targets:
                description = "Finding libc suffix",
                command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"]))
 
-       # ccache helper
-       factory.addStep(FileDownload(
-               mastersrc = "ccache.sh",
-               slavedest = "../ccache.sh",
-               mode = 0755
-       ))
-
-       # ccache prepare
-       factory.addStep(ShellCommand(
-                name = "prepccache",
-                description = "Preparing ccache",
-                command = ["../ccache.sh"]
-       ))
-
        # install build key
-       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
-       factory.addStep(FileDownload(mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600))
+       factory.addStep(FileDownload(name="dlkeybuild", mastersrc=home_dir+'/key-build', slavedest="key-build", mode=0600))
+       factory.addStep(FileDownload(name="dlkeybuildpub", mastersrc=home_dir+'/key-build.pub', slavedest="key-build.pub", mode=0600))
 
        # prepare dl
        factory.addStep(ShellCommand(
@@ -762,30 +753,7 @@ for target in targets:
        ))
 
        if enable_kmod_archive:
-               factory.addStep(ShellCommand(
-                       name = "kmoddir",
-                       description = "Creating kmod directory",
-                       command=["mkdir", "-p", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s", target=ts[0], subtarget=ts[1])],
-                       haltOnFailure = True
-               ))
-
-               factory.addStep(ShellCommand(
-                       name = "kmodprepare",
-                       description = "Preparing kmod archive",
-                       command=["rsync", "--include=/kmod-*.ipk", "--exclude=*", "-va",
-                                Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/packages/", target=ts[0], subtarget=ts[1]),
-                                Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
-                       haltOnFailure = True
-               ))
-
-               factory.addStep(ShellCommand(
-                       name = "kmodindex",
-                       description = "Indexing kmod archive",
-                       command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/index", "V=s",
-                                Interpolate("PACKAGE_SUBDIRS=bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
-                       env = MakeEnv(),
-                       haltOnFailure = True
-               ))
+               # embed kmod repository. Must happen before 'images'
 
                # find rootfs staging directory
                factory.addStep(SetPropertyFromCommand(
@@ -836,6 +804,32 @@ for target in targets:
                haltOnFailure = True
        ))
 
+       if enable_kmod_archive:
+               factory.addStep(ShellCommand(
+                       name = "kmoddir",
+                       description = "Creating kmod directory",
+                       command=["mkdir", "-p", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s", target=ts[0], subtarget=ts[1])],
+                       haltOnFailure = True
+               ))
+
+               factory.addStep(ShellCommand(
+                       name = "kmodprepare",
+                       description = "Preparing kmod archive",
+                       command=["rsync", "--include=/kmod-*.ipk", "--exclude=*", "-va",
+                                Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/packages/", target=ts[0], subtarget=ts[1]),
+                                Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
+                       haltOnFailure = True
+               ))
+
+               factory.addStep(ShellCommand(
+                       name = "kmodindex",
+                       description = "Indexing kmod archive",
+                       command=["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "package/index", "V=s",
+                                Interpolate("PACKAGE_SUBDIRS=bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1])],
+                       env = MakeEnv(),
+                       haltOnFailure = True
+               ))
+
        # sign
        if gpg_keyid is not None:
                factory.addStep(MasterShellCommand(
@@ -867,6 +861,7 @@ for target in targets:
                ))
 
                factory.addStep(FileDownload(
+                       name = "dlsigntargz",
                        mastersrc = "%s/signing/%s.%s.tar.gz" %(home_dir, ts[0], ts[1]),
                        slavedest = "sign.tar.gz",
                        haltOnFailure = True
@@ -906,21 +901,63 @@ for target in targets:
        factory.addStep(ShellCommand(
                name = "dirupload",
                description = "Uploading directory structure",
-               command = ["rsync", "-4", "-az", "tmp/upload/", "%s/" %(rsync_bin_url)],
+               command = ["rsync", "-4", "--timeout=120", "--contimeout=20", "-az", "tmp/upload/", "%s/" %(rsync_bin_url)],
                env={'RSYNC_PASSWORD': rsync_bin_key},
                haltOnFailure = True,
                logEnviron = False,
        ))
 
+       # download remote sha256sums to 'target-sha256sums'
+       factory.addStep(ShellCommand(
+               name = "target-sha256sums",
+               description = "Fetching remote sha256sums for target",
+               command = ["rsync", "-4", "--timeout=120", "--contimeout=20", "-vz", Interpolate("%(kw:rsyncbinurl)s/targets/%(kw:target)s/%(kw:subtarget)s/sha256sums", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1]), "target-sha256sums"],
+               env={'RSYNC_PASSWORD': rsync_bin_key},
+               logEnviron = False,
+               haltOnFailure = False,
+               flunkOnFailure = False,
+               warnOnFailure = False,
+       ))
+
+       # build list of files to upload
        factory.addStep(FileDownload(
-                       mastersrc = "rsync.sh",
-                       slavedest = "../rsync.sh",
-                       mode = 0755))
+               name = "dlsha2rsyncpl",
+               mastersrc = "sha2rsync.pl",
+               slavedest = "../sha2rsync.pl",
+               mode = 0755,
+       ))
 
+       factory.addStep(ShellCommand(
+               name = "buildlist",
+               description = "Building list of files to upload",
+               command = ["../sha2rsync.pl", "target-sha256sums", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/sha256sums", target=ts[0], subtarget=ts[1]), "rsynclist"],
+               haltOnFailure = True,
+       ))
+
+       factory.addStep(FileDownload(
+               name = "dlrsync.sh",
+               mastersrc = "rsync.sh",
+               slavedest = "../rsync.sh",
+               mode = 0755
+       ))
+
+       # upload new files and update existing ones
        factory.addStep(ShellCommand(
                name = "targetupload",
                description = "Uploading target files",
-               command=["../rsync.sh", "-4", "--exclude=/kmods/", "--delete", "--size-only", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+               command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--exclude=/kmods/", "--files-from=rsynclist", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+                        "-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/", target=ts[0], subtarget=ts[1]),
+                        Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
+               env={'RSYNC_PASSWORD': rsync_bin_key},
+               haltOnFailure = True,
+               logEnviron = False,
+       ))
+
+       # delete files which don't exist locally
+       factory.addStep(ShellCommand(
+               name = "targetprune",
+               description = "Pruning target files",
+               command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--exclude=/kmods/", "--delete", "--existing", "--ignore-existing", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
                         "-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/", target=ts[0], subtarget=ts[1]),
                         Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
                env={'RSYNC_PASSWORD': rsync_bin_key},
@@ -932,7 +969,7 @@ for target in targets:
                factory.addStep(ShellCommand(
                        name = "kmodupload",
                        description = "Uploading kmod archive",
-                       command=["../rsync.sh", "-4", "--delete", "--size-only", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+                       command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
                                 "-a", Interpolate("bin/targets/%(kw:target)s/%(kw:subtarget)s%(prop:libc)s/kmods/%(prop:kernelversion)s/", target=ts[0], subtarget=ts[1]),
                                 Interpolate("%(kw:rsyncbinurl)s/%(kw:prefix)stargets/%(kw:target)s/%(kw:subtarget)s/kmods/%(prop:kernelversion)s/", rsyncbinurl=rsync_bin_url, target=ts[0], subtarget=ts[1], prefix=GetVersionPrefix)],
                        env={'RSYNC_PASSWORD': rsync_bin_key},
@@ -944,7 +981,7 @@ for target in targets:
                factory.addStep(ShellCommand(
                        name = "sourceupload",
                        description = "Uploading source archives",
-                       command=["../rsync.sh", "-4", "--size-only", "--delay-updates",
+                       command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--size-only", "--delay-updates",
                                 Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:slavename)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)],
                        env={'RSYNC_PASSWORD': rsync_src_key},
                        haltOnFailure = True,
@@ -955,7 +992,7 @@ for target in targets:
                factory.addStep(ShellCommand(
                        name = "packageupload",
                        description = "Uploading package files",
-                       command=["../rsync.sh", "-4", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-a", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
+                       command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-a", "bin/packages/", "%s/packages/" %(rsync_bin_url)],
                        env={'RSYNC_PASSWORD': rsync_bin_key},
                        haltOnFailure = False,
                        logEnviron = False,
@@ -966,7 +1003,7 @@ for target in targets:
                factory.addStep(ShellCommand(
                        name = "upload",
                        description = "Uploading logs",
-                       command=["../rsync.sh", "-4", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
+                       command=["../rsync.sh", "-4", "--timeout=120", "--contimeout=20", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-az", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])],
                        env={'RSYNC_PASSWORD': rsync_bin_key},
                        haltOnFailure = False,
                        alwaysRun = True,