Faidon Liambotis has submitted this change and it was merged.
Change subject: contint: do not install zuul on light slaves
......................................................................
contint: do not install zuul on light slaves
There is no zuul package for Jessie yet thus applying
role::ci::slave::labs::light fails puppet.
Move the zuul install out of the common class to the more specific
classes.
Bug: T94836
Change-Id: I849fa59683f09a99e2a5a5cd058bf9e60faeadce
---
M manifests/role/ci.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index 5d130c1..7d53d0a 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -248,7 +248,6 @@
# Jenkins slaves need to access beta cluster for the browsertests
include contint::firewall::labs
- include role::zuul::install
if $::site == 'eqiad' {
# Does not come with /dev/vdb, we need to mount it using lvm
@@ -349,6 +348,7 @@
}
include role::ci::slave::labs::common
+ include role::zuul::install
include contint::browsers
}
@@ -360,6 +360,7 @@
}
include role::ci::slave::labs::common
+ include role::zuul::install
# We are in labs context, so use /mnt (== /dev/vdb)
# Never EVER think about using GlusterFS.
@@ -470,6 +471,7 @@
}
include role::ci::slave::labs::common
+ include role::zuul::install
include role::ci::slave::localbrowser
--
To view, visit https://gerrit.wikimedia.org/r/217476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I849fa59683f09a99e2a5a5cd058bf9e60faeadce
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@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
