Skip to content
Snippets Groups Projects
Commit 92925e2d authored by Pavel Zhukov's avatar Pavel Zhukov
Browse files

.oniro-ci: Inherit abicheck for binaryaudit


Signed-off-by: default avatarPavel Zhukov <pavel.zhukov@huawei.com>
parent 9fdf79b5
No related branches found
No related tags found
No related merge requests found
This commit is part of merge request !114. Comments created here will be created in the context of that merge request.
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
CI_ONIRO_BB_LOCAL_CONF_SSTATE_DIR: $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache CI_ONIRO_BB_LOCAL_CONF_SSTATE_DIR: $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache
CI_ONIRO_BB_LOCAL_CONF_IMAGE_VERSION_SUFFIX: "" CI_ONIRO_BB_LOCAL_CONF_IMAGE_VERSION_SUFFIX: ""
CI_ONIRO_BB_LOCAL_CONF_CVE_CHECK_DB_DIR: "$${TMPDIR}/CVE_CHECK/" CI_ONIRO_BB_LOCAL_CONF_CVE_CHECK_DB_DIR: "$${TMPDIR}/CVE_CHECK/"
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check abicheck
CI_ONIRO_BB_LOCAL_CONF_plus_equals_USER_CLASSES: "buildstats buildstats-summary" CI_ONIRO_BB_LOCAL_CONF_plus_equals_USER_CLASSES: "buildstats buildstats-summary"
CI_ONIRO_DEVTOOL_RECIPE_NAME: "" CI_ONIRO_DEVTOOL_RECIPE_NAME: ""
CI_ONIRO_DEVTOOL_LAYER_PATH: "" CI_ONIRO_DEVTOOL_LAYER_PATH: ""
...@@ -413,6 +413,14 @@ ...@@ -413,6 +413,14 @@
.build: .build:
extends: .build-recipe extends: .build-recipe
.check-abi:
variables:
CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: abicheck
CI_ONIRO_MANIFEST_NAME: manifests/ci.xml
script:
- !reference [.bitbake-workspace, script]
- bitbake-layers add-layer ../meta-binaryaudit
# This job is documented in docs/ci/hidden-jobs/build-docs.rst # This job is documented in docs/ci/hidden-jobs/build-docs.rst
.build-docs: .build-docs:
interruptible: true interruptible: true
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# The following jobs are documented in docs/ci/machines-and-flavours.rst # The following jobs are documented in docs/ci/machines-and-flavours.rst
linux-qemu-x86: linux-qemu-x86:
extends: .build-wic-image extends: [.build-wic-image, .check-abi]
variables: variables:
MACHINE: qemux86 MACHINE: qemux86
CI_ONIRO_BUILD_FLAVOUR: linux CI_ONIRO_BUILD_FLAVOUR: linux
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
SPDX-License-Identifier: Apache-2.0
SPDX-FileCopyrightText: Huawei Inc.
-->
<manifest>
<include name="manifests/default.xml" />
<project name="oniro-core/meta-binaryaudit" remote="eclipse" revision="oniro/kirkstone" path="meta-binaryaudit" />
</manifest>
...@@ -54,6 +54,5 @@ SPDX-FileCopyrightText: Huawei Inc. ...@@ -54,6 +54,5 @@ SPDX-FileCopyrightText: Huawei Inc.
<project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" /> <project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" />
<project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" /> <project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" />
<project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" /> <project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" />
<project name="oniro-core/meta-binaryaudit" remote="eclipse" revision="kirkstone" path="meta-binaryaudit" />
<project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" /> <project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" />
</manifest> </manifest>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment