From 443efb59b410e77b4b4b853b4345e85c3b95cf05 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Thu, 12 May 2022 22:57:59 +0200
Subject: [PATCH] fixup-cannot-force-push
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63534bac..98c3194e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -106,6 +106,7 @@ publish-raspberrypi4-64:
CI_ONIRO_RAUC_BUNDLE_NAME: oniro-bundle-base
MACHINE: raspberrypi4-64
script:
+ - env | grep HAWKBIT_
- test -n "${HAWKBIT_URL:-}" || (
echo "precondition failed - HAWKBIT_URL is not set."
&& exit 1 )
@@ -147,8 +148,8 @@ publish-raspberrypi4-64:
-modules "$CI_ONIRO_HAWKBIT_SWMOD_NAME:$BUNDLE_VERSION" \
-description "Automatic build from Oniro CI"
- hawkbitctl upload \
- -m "$CI_ONIRO_HAWKBIT_SWMOD_NAME:$CI_ONIRO_HAWKBIT_SWMOD_VERSION" \
- -a "$BUNDLE_FILE"
+ -m "$CI_ONIRO_HAWKBIT_SWMOD_NAME:$BUNDLE_VERSION" \
+ -a "${CI_PROJECT_DIR}/artifacts/images/${MACHINE}/$(readlink "${CI_PROJECT_DIR}/artifacts/images/${MACHINE}/${CI_ONIRO_RAUC_BUNDLE_NAME}-${MACHINE}.raucb")"
rules:
# There's no point in trying when we don't have credentials or instance URL.
- if: '$HAWKBIT_USERNAME == "" || $HAWKBIT_PASSWORD == "" || $HAWKBIT_URL == ""'
--
GitLab