diff options
author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-18 14:55:34 +0000 |
---|---|---|
committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2018-06-24 11:47:56 +0000 |
commit | 0057fd53d72afac43efb6990263148aaba2c75ec (patch) | |
tree | 30546851ce08875cea7dfa610b0119f8e440dbcb /jenkins-helpers.sh | |
parent | 82de5651cf9290ee14e3a2f62edaf63a2a0029c8 (diff) |
jenkins-helpers: Hard-code tcwg-buildslave's home in snapshots path.
This is a no-op for automation, but brings us closer to be able to run
tcwg-buildfarm.sh script as non-tcwg-buildslave user.
Change-Id: Iee304570d2b3ad69b0c17297c5a54fa3be64cb97
Diffstat (limited to 'jenkins-helpers.sh')
-rw-r--r-- | jenkins-helpers.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index 160d9184..52677e86 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -427,18 +427,18 @@ print_bind_mounts () exit 1 fi - home_src="$HOME" + snapshots_top="/home/tcwg-buildslave" workspace_src="$WORKSPACE" if [ -f "/.dockerenv" ] && mount | grep -q "/run/docker.sock "; then # If inside "host" container (with proxied docker and /home from host-home volume), # convert paths to refer to volume's path on bare-metal. - home_src=$(echo "$home_src" | sed -e "s#^/home/#/var/lib/docker/volumes/host-home/_data/#") + snapshots_top=$(echo "$snapshots_top" | sed -e "s#^/home/#/var/lib/docker/volumes/host-home/_data/#") workspace_src=$(echo "$workspace_src" | sed -e "s#^/home/#/var/lib/docker/volumes/host-home/_data/#") fi bind_mounts=( - $home_src/snapshots-ref:$HOME/snapshots-ref:ro - $home_src/llvm-reference:$HOME/llvm-reference:ro + $snapshots_top/snapshots-ref:/home/tcwg-buildslave/snapshots-ref:ro + $snapshots_top/llvm-reference:/home/tcwg-buildslave/llvm-reference:ro $workspace_src:$WORKSPACE ) esac |