From 7d5f767eb17ea6a009a17666cffd7001ce0e243f Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Fri, 22 Jul 2022 10:43:11 +0200
Subject: [PATCH] .oniro-ci: Fix abichecker artifacts collection
It was broken because of BITBAKE_TMPDIR variable definition removal as
part of the cleanup. Define BITBAKE_TOPDIR variable instead which serves
needs of ABI checker better.
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.oniro-ci/build-generic.yaml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml
index 927bf423..6bcb6e3e 100644
--- a/.oniro-ci/build-generic.yaml
+++ b/.oniro-ci/build-generic.yaml
@@ -268,6 +268,9 @@
# The name of the build-specific deploy dir may vary. Ask bitbake instead
# of hard-coding it.
- eval "$(bitbake -e | grep ^DEPLOY_DIR= | sed -e 's/^DEPLOY_DIR/BITBAKE_DEPLOY_DIR/g')"
+ # Top level of bitbake working directory.
+ # The name is build specific ask bitbake instead of hard-coding.
+ - eval "$(bitbake -e | grep ^TOPDIR= | sed -e 's/^TOPDIR/BITBAKE_TOPDIR/g')"
# Uncompressed wic image is not needed in CI. We cannot remove it from
# meta-oniro-core/classes/oniro-image.bbclass as runqemu needs it for local
# build and boot.
@@ -286,8 +289,8 @@
)
fi
# Compress and copy artifacts of do_abicheck task (if any)
- if test -n "$CI_ONIRO_ABICHECK_TOPDIR" && test -d "$BITBAKE_TMPDIR"/../"$CI_ONIRO_ABICHECK_TOPDIR"; then
- tar -cJf "$CI_PROJECT_DIR"/artifacts/abicheck-"$CI_COMMIT_SHA".tar.xz "$BITBAKE_TMPDIR"/../"$CI_ONIRO_ABICHECK_TOPDIR"/*/*/binaryaudit
+ if test -n "$CI_ONIRO_ABICHECK_TOPDIR" && test -d "$BITBAKE_TOPDIR"/"$CI_ONIRO_ABICHECK_TOPDIR"; then
+ tar -cJf "$CI_PROJECT_DIR"/artifacts/abicheck-"$CI_COMMIT_SHA".tar.xz "$BITBAKE_TOPDIR"/"$CI_ONIRO_ABICHECK_TOPDIR"/*/*/binaryaudit
fi
set +x
artifacts:
--
GitLab