merchant

commit ef9847070494643701a64ffce05061f960303a71
parent b7fc4321fd93ffabc97917ed75037ea029d9edf2
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date:   Tue, 20 May 2025 12:12:37 +0200

Temporarily also process partial test coverage results

Diffstat:
M
contrib/ci/jobs/1-build/build.sh
 | 
18
------------------
M
contrib/ci/jobs/2-test/test.sh
 | 
24
+++++++++++++++++++++++-

2 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/contrib/ci/jobs/1-build/build.sh b/contrib/ci/jobs/1-build/build.sh
@@ -10,21 +10,3 @@ set -exuo pipefail
 
 make
 
-# FIXME: move this elsewhere
-mkdir -p /artifacts/merchant/${CI_COMMIT_REF} # Variable comes from CI environment
-lcov --capture --directory . --output-file /artifacts/merchant/${CI_COMMIT_REF}/coverage.info
-genhtml coverage.info --output-directory /artifacts/merchant/${CI_COMMIT_REF}/merchant-lcov
-
-# FIXME move to own job?
-ARTIFACT_PATH="/artifacts/merchant/${CI_COMMIT_REF}/merchant-lcov"
-
-RSYNC_HOST="taler.host.internal"
-RSYNC_PORT=424243
-RSYNC_PATH="incoming_packages/taler/"
-RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}"
-
-
-rsync -vP \
-      --port ${RSYNC_PORT} \
-      ${ARTIFACT_PATH} ${RSYNC_DEST}
-
diff --git a/contrib/ci/jobs/2-test/test.sh b/contrib/ci/jobs/2-test/test.sh
@@ -35,7 +35,29 @@ print_logs()
 	done
 }
 
-if ! check_command ; then
+check_command()
+RES=$?
+
+# FIXME: move this into own job? For testing, we also publish partial results even if test fails
+mkdir -p /artifacts/merchant/${CI_COMMIT_REF} # Variable comes from CI environment
+lcov --capture --directory . --output-file /artifacts/merchant/${CI_COMMIT_REF}/coverage.info || exit 1
+genhtml coverage.info --output-directory /artifacts/merchant/${CI_COMMIT_REF}/merchant-lcov || exit 1
+
+ARTIFACT_PATH="/artifacts/merchant/${CI_COMMIT_REF}/merchant-lcov"
+
+RSYNC_HOST="taler.host.internal"
+RSYNC_PORT=424243
+RSYNC_PATH="incoming_packages/taler/"
+RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}"
+
+
+rsync -vP \
+      --port ${RSYNC_PORT} \
+      ${ARTIFACT_PATH} ${RSYNC_DEST} || exit 1
+
+if ! $RES ; then
 	print_logs
 	exit 1
 fi
+
+