Alexandros Kosiaris has submitted this change and it was merged. Change subject: contint: install Zuul on all CI slaves ......................................................................
contint: install Zuul on all CI slaves Zuul will have a command line utility to fetch out multiple repositories. Thus install Zuul on all CI slaves to provide the zuul-cloner utility. The package python-pip is needed by both Zuul source code installation and the contint::packages::labs class. So I wrapped the package definition with ensure_packages() from stdlib to avoid a duplicate definition. Change-Id: Ib1c1fc777bdcba90b89ad4f3d46430ae8e7daadf --- M manifests/role/ci.pp M modules/contint/manifests/packages/labs.pp 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Hashar: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp index 367e2b9..1a2c40a 100644 --- a/manifests/role/ci.pp +++ b/manifests/role/ci.pp @@ -118,8 +118,9 @@ system::role { 'role::ci::slave': description => 'CI slave runner' } - include contint::packages, - role::gerrit::production::replicationdest + include contint::packages + include role::gerrit::production::replicationdest + include role::zuul::install deployment::target { 'contint-production-slaves': } @@ -177,8 +178,9 @@ class role::ci::slave::labs::common { # Jenkins slaves need to access beta cluster for the browsertests - include role::beta::natfix include contint::firewall::labs + include role::beta::natfix + include role::zuul::install if $::site == 'eqiad' { # Does not come with /dev/vdb, we need to mount it using lvm diff --git a/modules/contint/manifests/packages/labs.pp b/modules/contint/manifests/packages/labs.pp index a870952..81c49e2 100644 --- a/modules/contint/manifests/packages/labs.pp +++ b/modules/contint/manifests/packages/labs.pp @@ -46,7 +46,6 @@ package { [ 'npm', - 'python-pip', # Let us compile python modules: 'python-dev', @@ -64,6 +63,9 @@ ]: ensure => present, } + # Also provided by Zuul installation + ensure_packages(['python-pip']) + # Bring tox/virtualenv... from pip bug 44443 # TODO: Reevaluate this once we switch to trusty. Maybe provider being apt # would be better then -- To view, visit https://gerrit.wikimedia.org/r/141758 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1c1fc777bdcba90b89ad4f3d46430ae8e7daadf Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits