osmith submitted this change.

View Change


Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
jobs/coverity: fix clean up permission errors

Don't mount the host's osmo-ci/coverity dir in /build/osmo-ci/coverity.
The current working dir is mounted as /build, and because docker creates
the /build/osmo-ci directory structure as root, we end up with having
subdirectories created by root in our current working dir. These then
cause an error on the next run when jenkins tries to clean them up.

Fixes: 6a2451a0 ("jobs/coverity: adjust mount path to new home dir")
Change-Id: Ie0aa02d3821df6d0505748a7dd70ff67e4cf1405
---
M coverity/jenkins.sh
M jobs/coverity.yml
2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/coverity/jenkins.sh b/coverity/jenkins.sh
index b33ae86..d19b93c 100755
--- a/coverity/jenkins.sh
+++ b/coverity/jenkins.sh
@@ -7,7 +7,7 @@

export PATH=$PATH:/opt/coverity/current/bin

-base_dir="$HOME/osmo-ci/coverity"
+base_dir="/opt/osmo-ci/coverity"
src_dir="$PWD/source-Osmocom"
cov_dir="$src_dir/cov-int"

diff --git a/jobs/coverity.yml b/jobs/coverity.yml
index 8159940..d7492c4 100644
--- a/jobs/coverity.yml
+++ b/jobs/coverity.yml
@@ -17,7 +17,7 @@
-e PARALLEL_MAKE="$PARALLEL_MAKE" \
-u build \
-v "$PWD:/build" \
- -v "$HOME/osmo-ci/coverity:/build/osmo-ci/coverity:ro" \
+ -v "$HOME/osmo-ci/coverity:/opt/osmo-ci/coverity:ro" \
-v "/opt/coverity:/opt/coverity:ro" \
-w /build/coverity \
"$USER/debian-bookworm-build" \

To view, visit change 37231. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ie0aa02d3821df6d0505748a7dd70ff67e4cf1405
Gerrit-Change-Number: 37231
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged