From: Paul Spooren Date: Tue, 30 Jun 2020 23:28:02 +0000 (-1000) Subject: phase1: add JSON merge step X-Git-Tag: v1~58 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=e30b1cf1924821a03fff90d310a2a095ee134b37;p=buildbot.git 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 [allow the step to fail to satisfy 18.06 builders] Signed-off-by: Jo-Philipp Wich --- diff --git a/phase1/master.cfg b/phase1/master.cfg index d230466..3ba7a16 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 || true", + env = MakeEnv(), + haltOnFailure = True + )) + factory.addStep(ShellCommand( name = "checksums", description = "Calculating checksums",