osmith submitted this change.

View Change

Approvals:
  osmith: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

jobs/master,gerrit: fix pysim, sysmo-usim-tool

Don't attempt to create the CCACHE_DIR and chown it to osmocom-build for
the simtester jenkins node, and more generally all that were not
created with the ansible provisioning scripts. In case of simtester,
there is no osmocom-build user and we don't have the space there to use
ccache.

Fix for:
  chown: invalid user: ‘osmocom-build:osmocom-build’

Related: OS#5848
Change-Id: I339d9ba4ad0c959d7325820eb53bfa1f0e04c164
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 40e7d68..56470df 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -61,6 +61,10 @@
               -w /build -i -u build \
               -v "$PWD:/build" \
     docker_run_ccache: |
+            CCACHE_DIR="$HOME/ccache/gerrit-verifications"
+            mkdir -p "$CCACHE_DIR"
+            chown osmocom-build:osmocom-build "$CCACHE_DIR"
+
             docker run --rm=true \
               --cap-add SYS_PTRACE \
               -e ASCIIDOC_WARNINGS_CHECK="1" \
@@ -76,7 +80,7 @@
               \
               -e CCACHE_DIR="/ccache" \
               -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
-              -v "$HOME/ccache/gerrit-verifications:/ccache" \
+              -v "$CCACHE_DIR:/ccache" \
     docker_img: '$USER/debian-buster-jenkins'
     docker_img_erlang: '$USER/debian-bullseye-erlang'
     timeout_cmd: '/usr/bin/timeout 30m'
@@ -696,10 +700,6 @@
           description: set by gerrit-{repos} job
 
     builders:
-      - shell: |-
-          CCACHE_DIR="$HOME/ccache/gerrit-verifications"
-          mkdir -p "$CCACHE_DIR"
-          chown osmocom-build:osmocom-build "$CCACHE_DIR"
       - shell: '{obj:cmd}'
 
     publishers:
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index fb05c53..ab1a0e2 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -39,6 +39,10 @@
               -v "$PWD:/build" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
     docker_run_ccache: |
+            CCACHE_DIR="$HOME/ccache/master-builds"
+            mkdir -p "$CCACHE_DIR"
+            chown osmocom-build:osmocom-build "$CCACHE_DIR"
+
             docker run --rm=true \
               --cap-add SYS_PTRACE \
               -e ASCIIDOC_WARNINGS_CHECK="1" \
@@ -58,7 +62,7 @@
               \
               -e CCACHE_DIR="/ccache" \
               -e PATH="/usr/lib/ccache:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
-              -v "$HOME/ccache/master-builds:/ccache" \
+              -v "$CCACHE_DIR:/ccache" \
     docker_img: '$USER/debian-buster-jenkins'
     timeout_cmd: '/usr/bin/timeout 30m'
     cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'
@@ -566,10 +570,6 @@
       - timed: "H H * * *"
 
     builders:
-      - shell: |-
-          CCACHE_DIR="$HOME/ccache/master-builds"
-          mkdir -p "$CCACHE_DIR"
-          chown osmocom-build:osmocom-build "$CCACHE_DIR"
       - shell: '{obj:cmd}'
 
     publishers:

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.

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