Re: [OpenWrt-Devel] [PATCH v2] phase1: Add JSON merging step
On Wed, 2020-04-08 at 21:09 +0200, Petr Štetiar wrote: > Paul Spooren [2020-04-08 08:57:13]: > > > v2: > > * Removed the `haltOnFailure` options as this may break the > > current > > builds if the merge script show any unexpected errors in the > > buildbot > > environment. This option should be added again once the script > > proofs > > working. > > Crash early, crash often. We've spent additional time to make the > pipeline > fail at every single step, now you're going to disable it? Why? Did > you > witnessed some breakage? I now found another issue for "legacy" images which is fixed via [PATCH] scripts: JSON merge don't crash if no JSON found > > From my point of view it doesnt make sense and its waste of time. True > > -- ynezz > > ___ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] phase1: Add JSON merging step
Paul Spooren [2020-04-08 08:57:13]: > v2: > * Removed the `haltOnFailure` options as this may break the current > builds if the merge script show any unexpected errors in the buildbot > environment. This option should be added again once the script proofs > working. Crash early, crash often. We've spent additional time to make the pipeline fail at every single step, now you're going to disable it? Why? Did you witnessed some breakage? >From my point of view it doesnt make sense and its waste of time. -- ynezz ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2] phase1: Add JSON merging 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 CC: Jo-Philipp Wich --- v2: * Removed the `haltOnFailure` options as this may break the current builds if the merge script show any unexpected errors in the buildbot environment. This option should be added again once the script proofs working. phase1/master.cfg | 7 +++ 1 file changed, 7 insertions(+) diff --git a/phase1/master.cfg b/phase1/master.cfg index 792f9b3..8702093 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -925,6 +925,13 @@ for target in targets: haltOnFailure = True )) + factory.addStep(ShellCommand( + name = "json_overview_image_info", + description = "Merging created JSON info files into profiles.json", + command=["make", "-j1", "json_overview_image_info", "V=s"], + env = MakeEnv() + )) + factory.addStep(ShellCommand( name = "checksums", description = "Calculating checksums", -- 2.25.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
