Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379727 )
Change subject: Decouple profile::ci::docker and zuul-cloner install
......................................................................
Decouple profile::ci::docker and zuul-cloner install
Create a dummy profile to install the zuul package (which really is only
needed for the zuul-cloner CLI).
Add the profile at the role level instead of invoking the class from the
profile::ci::docker.
Bug: T176267
Change-Id: I427fd601572abdb99c5dca730fd62ad991a17987
---
M modules/profile/manifests/ci/docker.pp
A modules/profile/manifests/zuul/cloner.pp
M modules/role/manifests/ci/slave.pp
M modules/role/manifests/ci/slave/labs.pp
M modules/role/manifests/ci/slave/labs/docker.pp
5 files changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/379727/1
diff --git a/modules/profile/manifests/ci/docker.pp
b/modules/profile/manifests/ci/docker.pp
index 8b84cd0..2227c23 100644
--- a/modules/profile/manifests/ci/docker.pp
+++ b/modules/profile/manifests/ci/docker.pp
@@ -5,7 +5,6 @@
class profile::ci::docker {
include ::docker
- include ::zuul
class { 'contint::worker_localhost':
owner => 'jenkins-deploy',
diff --git a/modules/profile/manifests/zuul/cloner.pp
b/modules/profile/manifests/zuul/cloner.pp
new file mode 100644
index 0000000..ead53a8
--- /dev/null
+++ b/modules/profile/manifests/zuul/cloner.pp
@@ -0,0 +1,6 @@
+# == Class profile::zuul::cloner
+#
+# Install the Zuul gating system to provide zuul-cloner
+class profile::zuul::cloner {
+ include ::zuul
+}
diff --git a/modules/role/manifests/ci/slave.pp
b/modules/role/manifests/ci/slave.pp
index 605444e..4bf22da 100644
--- a/modules/role/manifests/ci/slave.pp
+++ b/modules/role/manifests/ci/slave.pp
@@ -12,7 +12,7 @@
include contint::packages::base
include contint::slave_scripts
- include ::zuul
+ include ::profile::zuul::cloner
class { 'jenkins::slave':
# Master connect to itself via the fqdn / primary IP ipaddress
diff --git a/modules/role/manifests/ci/slave/labs.pp
b/modules/role/manifests/ci/slave/labs.pp
index 7b83879..0c96ac8 100644
--- a/modules/role/manifests/ci/slave/labs.pp
+++ b/modules/role/manifests/ci/slave/labs.pp
@@ -5,6 +5,8 @@
system::role { 'ci::slave::labs':
description => 'CI Jenkins slave on labs' }
+ include ::profile::zuul::cloner
+
# Debian slaves are used to build Debian packages for all our distributions
system::role { '::package_builder':
description => 'CI package building',
@@ -35,7 +37,6 @@
include role::ci::slave::labs::common
- include ::zuul
include contint::browsers
diff --git a/modules/role/manifests/ci/slave/labs/docker.pp
b/modules/role/manifests/ci/slave/labs/docker.pp
index d1bc47c..901eaeb 100644
--- a/modules/role/manifests/ci/slave/labs/docker.pp
+++ b/modules/role/manifests/ci/slave/labs/docker.pp
@@ -11,4 +11,5 @@
include role::ci::slave::labs::common
include profile::ci::docker
include profile::phabricator::arcanist
+ include profile::zuul::cloner
}
--
To view, visit https://gerrit.wikimedia.org/r/379727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I427fd601572abdb99c5dca730fd62ad991a17987
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
