[buildbot] phase1: add JSON merge step

[LEDE Commits]

jow pushed a commit to buildbot.git, branch deployment-2020-07-30:
https://git.openwrt.org/cd69c97dba5d6aebc9eb71e216f0f3da742d4181

commit cd69c97dba5d6aebc9eb71e216f0f3da742d4181
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>
    (cherry picked from commit e30b1cf1924821a03fff90d310a2a095ee134b37)
---
 phase1/master.cfg | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 792f9b3..a1f39ce 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -925,6 +925,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",