Thcipriani has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/360544 )
Change subject: Move operations/puppet log volume
......................................................................
Move operations/puppet log volume
Because we were mounting the log volume at `.cache/log` and the `.cache`
directory didn't exist, that directory was created as the root user. As
a result, the process run inside the container by the `jenkins` user did
not have permission to create its needed cache directories.
This changes the mounted log volume to "$HOME/log" ($HOME is created as
part of the Dockerfile and has correct permissions). This also modifies
the Jenkins job slightly to use the new version of the container.
Change-Id: I7b522ac5e90f2e0af388c815d931a23251f4b37c
---
M dockerfiles/contint-operations-puppet/run.sh
M jjb/operations-puppet.yaml
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/44/360544/1
diff --git a/dockerfiles/contint-operations-puppet/run.sh
b/dockerfiles/contint-operations-puppet/run.sh
index d4a257a..1abb2bb 100644
--- a/dockerfiles/contint-operations-puppet/run.sh
+++ b/dockerfiles/contint-operations-puppet/run.sh
@@ -3,7 +3,7 @@
set -eux
TEMP_DIR=$(mktemp -d)
-LOG_DIR="$HOME/.cache/log"
+LOG_DIR="$HOME/log"
capture_logs() {
# Save logs
diff --git a/jjb/operations-puppet.yaml b/jjb/operations-puppet.yaml
index 4319ee9..5504534 100644
--- a/jjb/operations-puppet.yaml
+++ b/jjb/operations-puppet.yaml
@@ -140,8 +140,8 @@
--rm --tty \
--env-file .env \
--volume /srv/git:/srv/git:ro \
- --volume "$(pwd)"/log:/var/lib/jenkins/.cache/log \
- ci-staging-docker-registry01.wmflabs.org/contint/operations-puppet
+ --volume "$(pwd)"/log:/var/lib/jenkins/log \
+
ci-staging-docker-registry01.wmflabs.org/contint/operations-puppet:v0.0.2
wrappers:
timeout: 1 # minute
publishers:
--
To view, visit https://gerrit.wikimedia.org/r/360544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b522ac5e90f2e0af388c815d931a23251f4b37c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani <tcipri...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
