From daa63d18a76dedf400279a3a5bcb5a947bc40c78 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Tue, 26 Jun 2018 20:29:47 +0200 Subject: [PATCH] phase1: name all download and git steps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 78a83fa..e04ec55 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -442,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)) @@ -473,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", @@ -489,6 +491,7 @@ for target in targets: # cleanup.sh if needed factory.addStep(FileDownload( + name = "dlcleanupsh", mastersrc = "cleanup.sh", slavedest = "../cleanup.sh", mode = 0755, @@ -530,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', @@ -539,6 +543,7 @@ for target in targets: )) factory.addStep(Git( + name = "gitfresh", repourl = repo_url, branch = repo_branch, mode = 'full', @@ -598,6 +603,7 @@ for target in targets: # seed config factory.addStep(FileDownload( + name = "dlconfigseed", mastersrc = "config.seed", slavedest = ".config", mode = 0644 @@ -642,8 +648,8 @@ for target in targets: command = ["sed", "-ne", '/^CONFIG_LIBC=/ { s!^CONFIG_LIBC="\\(.*\\)"!\\1!; s!^musl$!!; s!.\\+!-&!p }', ".config"])) # 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( @@ -852,6 +858,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 @@ -898,9 +905,11 @@ for target in targets: )) factory.addStep(FileDownload( - mastersrc = "rsync.sh", - slavedest = "../rsync.sh", - mode = 0755)) + name = "dlrsync.sh", + mastersrc = "rsync.sh", + slavedest = "../rsync.sh", + mode = 0755 + )) factory.addStep(ShellCommand( name = "targetupload", -- 2.30.2