Skip to contentSkip to conversation

config.json: Enable dedicated sstate during build and remove after

PATCH In review Michael Halstead 2 participants 2 messages Nov 10, 2018

lore
Share & tools
lore

Michael Halstead

author
#0 lore raw

PATCH 1/1 config.json: Enable dedicated sstate during build and remove after

Without any sstate available oe-selftest cannot run in parallel. Set sstate to a location used only by these builds and remove it as the last step.

Signed-off-by Michael Halstead <[email protected]>
---
 config.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
config.json +4 -1
index 8a694d7..d898bf3 100644
@@ -147,7 +147,7 @@
         },
        "nightly-bringup" : {
             "TEMPLATE" : "nightly-arch",
-            "SSTATEDIR" : [],
+            "SSTATEDIR" : ["${BUILDDIR}/../sstate"],
             "MACHINE" : "qemuarm64",
             "step2" : {
                 "MACHINE" : "qemux86-64"

@@ -168,6 +168,9 @@
                 ],
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"],
                 "ADDLAYER" : ["${BUILDDIR}/../meta-selftest"]
+            },
+            "step7" : {
+               "EXTRACMDS" : ["rm -rf ${BUILDDIR}/../sstate"]
             }
         },
         "nightly-mips" : {
Signature · 1 line
2.17.2
#1 lore raw
Quoted 32 lines · Michael Halstead

Without any sstate available oe-selftest cannot run in parallel. Set sstate to a
location used only by these builds and remove it as the last step.

Signed-off-by Michael Halstead <[email protected]>
---
 config.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
config.json +4 -1
index 8a694d7..d898bf3 100644
@@ -147,7 +147,7 @@
         },
        "nightly-bringup" : {
             "TEMPLATE" : "nightly-arch",
-            "SSTATEDIR" : [],
+            "SSTATEDIR" : ["${BUILDDIR}/../sstate"],
             "MACHINE" : "qemuarm64",
             "step2" : {
                 "MACHINE" : "qemux86-64"

@@ -168,6 +168,9 @@
                 ],
                 "EXTRACMDS" : ["${SCRIPTSDIR}/checkvnc; DISPLAY=:1
 oe-selftest --skip-tests distrodata.Distrodata.test_checkpkg -j 15"],
                 "ADDLAYER" : ["${BUILDDIR}/../meta-selftest"]
+            },
+            "step7" : {
+               "EXTRACMDS" : ["rm -rf ${BUILDDIR}/../sstate"]
             }
         },
Quoted 1 line
         "nightly-mips" : {

Unfortunately this won't work as BUILDDIR is a shell variable in this case. I've tweaked the scripts/config a little differently to try and speed up the bringup tests and fired off another couple of test builds.

Cheers,

Richard