From 80fe0ab06972c46c82cde29cbdfcdac6e87dde99 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 29 Nov 2020 23:35:56 +0000 Subject: [PATCH] config.json: Unbreak qa-extras locked sigs test qa-extras and qa-extras2 were split incorrectly, fix this. Signed-off-by: Richard Purdie --- config.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/config.json b/config.json index 5266d45..72935f0 100644 --- a/config.json +++ b/config.json @@ -832,18 +832,18 @@ "TMPDIR = '${TOPDIR}/newtmp'", "require ../locked-sigs.inc" ] - } - }, - "qa-extras2" : { - "MACHINE" : "qemux86-64", - "step1" : { + }, + "step7" : { "SDKMACHINE" : "x86_64", "BBTARGETS" : "core-image-sato:do_populate_sdk_ext", "extravars" : [ "TMPDIR = '${TOPDIR}/sdktmp'" ] - }, - "step2" : { + } + }, + "qa-extras2" : { + "MACHINE" : "qemux86-64", + "step1" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -851,7 +851,7 @@ "TEST_SUITES_append = ' logrotate'" ] }, - "step3" : { + "step2" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -859,7 +859,7 @@ "TEST_SUITES_append = ' pam'" ] }, - "step4" : { + "step3" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -868,7 +868,7 @@ ], "ADDLAYER" : ["${BUILDDIR}/../meta-skeleton"] }, - "step5" : { + "step4" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -877,7 +877,7 @@ "TEST_SUITES_append = ' systemd'" ] }, - "step6" : { + "step5" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -885,7 +885,7 @@ "VIRTUAL-RUNTIME_init_manager = 'sysvinit'" ] }, - "step7" : { + "step6" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [ @@ -895,7 +895,7 @@ "DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'" ] }, - "step8" : { + "step7" : { "BBTARGETS" : "core-image-sato", "SANITYTARGETS" : "core-image-sato:do_testimage", "extravars" : [