Filippo Giunchedi has submitted this change and it was merged.
Change subject: Move arcanist install to contint::packages::labs
......................................................................
Move arcanist install to contint::packages::labs
jenkins::slave::requisites is solely to setup a Jenkins slave agents.
For example for the beta cluster where arcanist is not needed.
Move phabricator::arcanist to contint::packages::labs, since we only
need it on CI slaves.
Follow up 9634d072aac
Change-Id: Ib9d6529a1b2d5c990c30e05954f1c8772f3b51b2
---
M modules/contint/manifests/packages/labs.pp
M modules/jenkins/manifests/slave/requisites.pp
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 0328352..e0b6c5a 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -17,6 +17,8 @@
# Required for ruby testing
include ::contint::packages::ruby
+ include phabricator::arcanist
+
# Shell script wrappers to ease package building
# Package generated via the mirror operations/debs/jenkins-debian-glue.git
diff --git a/modules/jenkins/manifests/slave/requisites.pp
b/modules/jenkins/manifests/slave/requisites.pp
index 40a75f9..172e1fe 100644
--- a/modules/jenkins/manifests/slave/requisites.pp
+++ b/modules/jenkins/manifests/slave/requisites.pp
@@ -1,11 +1,9 @@
# == Class: jenkins::slave::requisites
#
-# Resources commons to all slaves, either in production or in labs
+# Dependency for the Jenkins agent on slaves
#
class jenkins::slave::requisites() {
ensure_packages(['openjdk-7-jre-headless'])
-
- include phabricator::arcanist
}
--
To view, visit https://gerrit.wikimedia.org/r/256941
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9d6529a1b2d5c990c30e05954f1c8772f3b51b2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
