From d2c5a5d289bf89eb58fa565a0836d899df2bf8bc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 24 Jan 2022 17:40:12 +0000 Subject: [PATCH] CI: fix check-layer indeterminism yocto-check-layers is very greedy when searching for layers, and will find the test layers in Bitbake if given the chance, for example: bitbake/lib/layerindexlib/tests/testdata/layer4 This layer has the collection name openembedded-layer and is only compatible with Sumo. The selection of layer from collection name is not deterministic, so it's possible that this layer is selected which then fails the check as it isn't compatible. Solve this by restricting the dependency layers in meta-arm to just meta-arm/meta-*, so it doesn't recurse into meta-arm/work/poky/bitbake. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a968486..354a6aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ check-layers: extends: .setup script: - kas shell --update --force-checkout ci/base.yml:ci/meta-openembedded.yml --command \ - "yocto-check-layer-wrapper $CI_PROJECT_DIR/$LAYER --dependency $CI_PROJECT_DIR $KAS_WORK_DIR/meta-openembedded/meta-oe --no-auto-dependency" + "yocto-check-layer-wrapper $CI_PROJECT_DIR/$LAYER --dependency $CI_PROJECT_DIR/meta-* $KAS_WORK_DIR/meta-openembedded/meta-oe --no-auto-dependency" parallel: matrix: - LAYER: [meta-arm, meta-arm-bsp, meta-arm-toolchain, meta-gem5]