aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2021-03-15 12:38:05 +0000
committerCorentin LABBE <clabbe@baylibre.com>2021-03-15 12:39:34 +0000
commit6719b1fe96fda398102f04ca438e8a74f73f679d (patch)
tree498b3141259423311c9960fa3b072e030a1eba44
parentf82cd14def7370b5be40f7bb5fb0d8206e0db1dd (diff)
SPEC-3414: fill empty variables
Some variables are empty: - TARGETARCH exists only on ci-apps, so fill it according to MACHINE - source build-info for the remaining ones Change-Id: I8e9ca0660475bf187616186c28eff08fc134743a Bug-AGL: SPEC-3414: Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
-rw-r--r--jjb/common/include-agl-kci-publish-build-meta.sh30
1 files changed, 30 insertions, 0 deletions
diff --git a/jjb/common/include-agl-kci-publish-build-meta.sh b/jjb/common/include-agl-kci-publish-build-meta.sh
index c2c1a5c1..edf91558 100644
--- a/jjb/common/include-agl-kci-publish-build-meta.sh
+++ b/jjb/common/include-agl-kci-publish-build-meta.sh
@@ -5,6 +5,13 @@ echo "#########################################"
echo "\n\n\n"
kci-publish() {
+ if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ] ; then
+ echo "DEBUG: load build-info"
+ # we need some variable from here
+ source tmp/deploy/images/${TARGETMACHINE}/build-info
+ fi
+ echo "DEBUG: GERRIT_PROJECT $GERRIT_PROJECT"
+
# check GERRIT_PROJECT to find if we build an app or not
if echo $GERRIT_PROJECT |grep -q apps ;then
# for app
@@ -14,6 +21,29 @@ kci-publish() {
BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION"
fi
+ # TARGETARCH exists only in ci-apps
+ case $TARGETMACHINE in
+ qemuarm64)
+ TARGETARCH="arm64"
+ ;;
+ qemuarm)
+ TARGETARCH="arm"
+ ;;
+ qemux86_64)
+ TARGETARCH="x86_64"
+ ;;
+ raspberrypi4)
+ TARGETARCH="arm64"
+ ;;
+ h3ulcb-nogfx)
+ TARGETARCH="arm64"
+ ;;
+ *)
+ echo "ERROR: unknow machine $TARGETMACHINE"
+ return 0
+ ;;
+ esac
+
echo "DEBUG: generate bmeta for kernelCI"
echo "DEBUG: machine ${TARGETMACHINE}"
echo "DEBUG: build_version $BUILD_VERSION"