[buildbot] phase1: rsync_src_url is always set
LEDE Commits
lede-commits at lists.infradead.org
Mon May 15 08:39:16 PDT 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/a3c5b501b7604413821330787f52683ad731f7c2
commit a3c5b501b7604413821330787f52683ad731f7c2
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Mon Oct 24 12:48:11 2022 +0200
phase1: rsync_src_url is always set
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase1/master.cfg | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 13dc148..0b7c609 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1035,24 +1035,23 @@ for target in targets:
locks = NetLockUl,
))
- if rsync_src_url is not None:
- factory.addStep(ShellCommand(
- name = "sourcelist",
- description = "Finding source archives to upload",
- command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer .config -printf '%f\\n' > sourcelist",
- haltOnFailure = True
- ))
+ factory.addStep(ShellCommand(
+ name = "sourcelist",
+ description = "Finding source archives to upload",
+ command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer .config -printf '%f\\n' > sourcelist",
+ haltOnFailure = True
+ ))
- factory.addStep(ShellCommand(
- name = "sourceupload",
- description = "Uploading source archives",
- command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_src_defopts +
- [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:workername)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)],
- env={'RSYNC_PASSWORD': rsync_src_key},
- haltOnFailure = True,
- logEnviron = False,
- locks = NetLockUl,
- ))
+ factory.addStep(ShellCommand(
+ name = "sourceupload",
+ description = "Uploading source archives",
+ command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_src_defopts +
+ [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:workername)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)],
+ env={'RSYNC_PASSWORD': rsync_src_key},
+ haltOnFailure = True,
+ logEnviron = False,
+ locks = NetLockUl,
+ ))
factory.addStep(ShellCommand(
name = "df",
More information about the lede-commits
mailing list