From 6719b1fe96fda398102f04ca438e8a74f73f679d Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Mon, 15 Mar 2021 12:38:05 +0000 Subject: 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 --- jjb/common/include-agl-kci-publish-build-meta.sh | 30 ++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'jjb/common/include-agl-kci-publish-build-meta.sh') 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" -- cgit 1.2.3-korg