Giuseppe Lavagetto has submitted this change and it was merged. Change subject: contint: move some useful packags to a new base class ......................................................................
contint: move some useful packags to a new base class extract basic utilities needed for all Jenkins slaves into a separate manifest contint::packages::base. For now only colordiff and curl. Include it from role::ci::slave::labs::common which is applied on all slaves. For Nodepool instances, we will include contint::packages::base when building the image ( https://gerrit.wikimedia.org/r/#/c/239047/ ). Bug: T112821 Change-Id: I3834dd4fb43245e34d71739b680f7b5b235265a6 --- M manifests/role/ci.pp M modules/contint/manifests/packages.pp A modules/contint/manifests/packages/base.pp 3 files changed, 22 insertions(+), 13 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp index 129868d..51604c2 100644 --- a/manifests/role/ci.pp +++ b/manifests/role/ci.pp @@ -230,6 +230,7 @@ # Jenkins slaves need to access beta cluster for the browsertests include contint::firewall::labs + include contint::packages::base if $::site == 'eqiad' { # Does not come with /dev/vdb, we need to mount it using lvm diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 4ac0f15..7a20652 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -5,6 +5,9 @@ # class contint::packages { + # Basic utilites needed for all Jenkins slaves + include ::contint::packages::base + include ::mediawiki::packages include ::mediawiki::packages::multimedia # T76661 @@ -137,19 +140,6 @@ # need geoip to build udp-filter include geoip - - # frontend tests use curl to make http requests to mediawiki - package { [ - 'curl', - ]: - ensure => present, - } - - # Colordiff gives us nice coloring in Jenkins console whenever - # it is used instead of the stock diff. - package { 'colordiff': - ensure => present, - } # JSDuck was built for Ubuntu ( T48236/ T82278 ) # It is a pain to rebuild for Jessie so give up (T95008), we will use diff --git a/modules/contint/manifests/packages/base.pp b/modules/contint/manifests/packages/base.pp new file mode 100644 index 0000000..701e880 --- /dev/null +++ b/modules/contint/manifests/packages/base.pp @@ -0,0 +1,18 @@ +# === Class contint::packages::base +# +# Basic utilites needed for all Jenkins slaves +# +class contint::packages::base { + # Colordiff gives us nice coloring in Jenkins console whenever + # it is used instead of the stock diff. + package { 'colordiff': + ensure => present, + } + + # frontend tests use curl to make http requests to mediawiki + package { [ + 'curl', + ]: + ensure => present, + } +} -- To view, visit https://gerrit.wikimedia.org/r/239044 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3834dd4fb43245e34d71739b680f7b5b235265a6 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Zfilipin <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
