From a8e1e687172ea72c326cf177845c23159c8780f2 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 8 Nov 2021 22:29:44 +0100
Subject: Workaround kernelci publisher issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Make sure we do have valid parameters.

Change-Id: I007fecd0abc1f2525ad511fbe65a39228e7e22b6
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/common/include-agl-kci-publish-build-meta.sh | 41 +++++++++++++-----------
 1 file changed, 23 insertions(+), 18 deletions(-)

(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 26db2385..1c586a45 100644
--- a/jjb/common/include-agl-kci-publish-build-meta.sh
+++ b/jjb/common/include-agl-kci-publish-build-meta.sh
@@ -68,38 +68,43 @@ kci-publish() {
 	;;
 	esac
 
+set -x
+set +e
+	DIST_BUILD_HASH="$BUILD_VERSION"
+
 	echo "DEBUG: generate bmeta for kernelCI"
 	echo "DEBUG: machine ${TARGETMACHINE}"
 	echo "DEBUG: build_version $BUILD_VERSION"
 	echo "DEBUG: commit $DIST_BUILD_HASH"
 	echo "DEBUG: arch $TARGETARCH"
 	echo "DEBUG: branch $GERRIT_BRANCH"
+	DIST_BUILD_HASH="$BUILD_VERSION"
 
-	[[ -z $DIST_BUILD_HASH ]] && DIST_BUILD_HASH="$BUILD_VERSION"
-
-	$RELENG/utils/agl-publish.py --machine ${TARGETMACHINE} \
-		--build_version $BUILD_VERSION \
-		--commit $DIST_BUILD_HASH \
-		--arch $TARGETARCH \
-		--fsr $FSR \
-		--branch $GERRIT_BRANCH \
-		--kernel_version $KERNEL_VERSION \
-		--api http://kernelci.dev.baylibre.com:8081/
+	$RELENG/utils/agl-publish.py --machine "${TARGETMACHINE}" \
+		--build_version "$BUILD_VERSION" \
+		--commit "$BUILD_VERSION" \
+		--arch "$TARGETARCH" \
+		--fsr "$FSR" \
+		--branch "$GERRIT_BRANCH" \
+		--kernel_version "$BUILD_VERSION" \
+		--api http://kernelci.dev.baylibre.com:8081/ || true
 
-	$RELENG/utils/agl-publish.py --machine ${TARGETMACHINE} \
-		--build_version $BUILD_VERSION \
-		--commit $DIST_BUILD_HASH \
-		--arch $TARGETARCH \
-		--fsr $FSR \
-		--branch $GERRIT_BRANCH \
-		--kernel_version $KERNEL_VERSION \
-		--api https://kernelci.automotivelinux.org:8081/
+	$RELENG/utils/agl-publish.py --machine "${TARGETMACHINE}" \
+		--build_version "$BUILD_VERSION" \
+		--commit "$BUILD_VERSION" \
+		--arch "$TARGETARCH" \
+		--fsr "$FSR" \
+		--branch "$GERRIT_BRANCH" \
+		--kernel_version "$BUILD_VERSION" \
+		--api https://kernelci.automotivelinux.org:8081/ || true
 	# DEBUG purpose, verify what is uploaded
 	if [ -e agl-build-meta ];then
 		find agl-build-meta -type f | xargs cat
 	else
 		echo "ERROR: no agl-build-meta directory"
 	fi
+set +x
+set -e
 	return 0
 }
 
-- 
cgit 1.2.3-korg