Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399206 )
Change subject: fabfile: run docker-pkg as ourselves
......................................................................
fabfile: run docker-pkg as ourselves
We are now members of the docker group and can thus run docker-pkg
directly without a sudo. Moreover jenkins-slave doesn't have
permissions to read /etc/docker-pkg/integration.yaml
Bug: T182860
Change-Id: I21314ce4076e9279e8a36374801dc8c70f753b28
---
M fabfile.py
1 file changed, 10 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/06/399206/1
diff --git a/fabfile.py b/fabfile.py
index cf82661..e33e9b4 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -50,20 +50,19 @@
if not updated:
return
- with settings(sudo_user='jenkins-slave'):
- with cd('/tmp'):
- docker_pkg = '/srv/deployment/docker-pkg/venv/bin/docker-pkg'
- docker_pkg_config = '/etc/docker-pkg/integration.yaml'
- dockerfiles = '/etc/zuul/wikimedia/dockerfiles'
- cmd = '{} -c {} {}'.format(
- docker_pkg, docker_pkg_config, dockerfiles)
+ with cd('/tmp'):
+ docker_pkg = '/srv/deployment/docker-pkg/venv/bin/docker-pkg'
+ docker_pkg_config = '/etc/docker-pkg/integration.yaml'
+ dockerfiles = '/etc/zuul/wikimedia/dockerfiles'
+ cmd = '{} -c {} {}'.format(
+ docker_pkg, docker_pkg_config, dockerfiles)
- sudo(cmd)
+ sudo(cmd)
- sudo('cat /tmp/docker-pkg-build.log')
+ sudo('cat /tmp/docker-pkg-build.log')
- if confirm('delete build log?'):
- sudo('rm /tmp/docker-pkg-build.log')
+ if confirm('delete build log?'):
+ sudo('rm /tmp/docker-pkg-build.log')
@task
--
To view, visit https://gerrit.wikimedia.org/r/399206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21314ce4076e9279e8a36374801dc8c70f753b28
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
