selftest/bblayers: fix up compatibility with integrated poky and separate layer checkouts

Specifically:

- when using integrated poky, autobuilder clones it into 'build', rather than 'poky'

- do not use a catch-all default to tweak the commit id openembedded-core, rather make it specific to that
repository.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/selftest/cases/bblayers.py b/meta/lib/oeqa/selftest/cases/bblayers.py
index 8026e7ed4a490131c4cdf91e2d9c338016f128bf..982287c9a54968742ba2bdd29e47b81c244234b1 100644 (file)
--- a/meta/lib/oeqa/selftest/cases/bblayers.py
+++ b/meta/lib/oeqa/selftest/cases/bblayers.py
@@ -157,11 +157,11 @@ class BitbakeLayers(OESelftestTestCase):
         with open(jsonfile) as f:
             data = json.load(f)
         for s in data['sources']:
-            if s == 'poky':
+            if s == 'poky' or s == 'build':
                 data['sources'][s]['git-remote']['rev'] = '5200799866b92259e855051112520006e1aaaac0'
             elif s == 'meta-yocto':
                 data['sources'][s]['git-remote']['rev'] = '913bd8ba4dd1d5d2a38261bde985b64a36e36281'
-            else:
+            elif s == 'openembedded-core':
                 data['sources'][s]['git-remote']['rev'] = '744a2277844ec9a384a9ca7dae2a634d5a0d3590'
         with open(jsonfile, 'w') as f:
             json.dump(data, f)