[buildbot] phase1: add JSON merge step

LEDE Commits lede-commits at lists.infradead.org
Thu Jul 30 06:14:29 EDT 2020


jow pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/ae0d0e31d5e00582f504c61198c2a0e0d54c2c58

commit ae0d0e31d5e00582f504c61198c2a0e0d54c2c58
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Tue Jun 30 13:28:02 2020 -1000

    phase1: add JSON merge step
    
    The refactored JSON info files require a final merge step which sums up
    all created JSON info files of a target into a single `profiles.json`
    files.
    
    This patch adds the extra step to run `make json_overview_image_info`
    just before calculating the checksums so the `profiles.json` files is
    signed as well.
    
    Signed-off-by: Paul Spooren <mail at aparcar.org>
    [allow the step to fail to satisfy 18.06 builders]
    Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
 phase1/master.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index d230466..1977983 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1047,6 +1047,14 @@ for target in targets:
 		haltOnFailure = True
 	))
 
+	factory.addStep(ShellCommand(
+		name = "json_overview_image_info",
+		description = "Generate profiles.json in target folder",
+		command=["make", "-j1", "json_overview_image_info", "V=s"],
+		env = MakeEnv(),
+		haltOnFailure = True
+	))
+
 	factory.addStep(ShellCommand(
 		name = "checksums",
 		description = "Calculating checksums",



More information about the lede-commits mailing list