[yocto-autobuilder-helper][dunfell 18/23] config.json: Unbreak qa-extras locked sigs test


Steve Sakoman
 

From: Richard Purdie <richard.purdie@linuxfoundation.org>

qa-extras and qa-extras2 were split incorrectly, fix this.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 80fe0ab06972c46c82cde29cbdfcdac6e87dde99)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
config.json | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config.json b/config.json
index 4856507..ddf36ae 100644
--- a/config.json
+++ b/config.json
@@ -802,18 +802,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" : [
@@ -821,7 +821,7 @@
"TEST_SUITES_append = ' logrotate'"
]
},
- "step3" : {
+ "step2" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
@@ -829,7 +829,7 @@
"TEST_SUITES_append = ' pam'"
]
},
- "step4" : {
+ "step3" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
@@ -838,7 +838,7 @@
],
"ADDLAYER" : ["${BUILDDIR}/../meta-skeleton"]
},
- "step5" : {
+ "step4" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
@@ -847,7 +847,7 @@
"TEST_SUITES_append = ' systemd'"
]
},
- "step6" : {
+ "step5" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
@@ -855,7 +855,7 @@
"VIRTUAL-RUNTIME_init_manager = 'sysvinit'"
]
},
- "step7" : {
+ "step6" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
@@ -865,7 +865,7 @@
"DISTRO_FEATURES_BACKFILL_CONSIDERED = 'sysvinit'"
]
},
- "step8" : {
+ "step7" : {
"BBTARGETS" : "core-image-sato",
"SANITYTARGETS" : "core-image-sato:do_testimage",
"extravars" : [
--
2.25.1

Join yocto@lists.yoctoproject.org to automatically receive all group messages.